Skip to content

Commit

Permalink
Merge pull request #3 from sweetrpg/1.18
Browse files Browse the repository at this point in the history
First releasable build
  • Loading branch information
paulyhedral authored Jan 30, 2024
2 parents d37fe7a + b04e7b2 commit e95038c
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 24 deletions.
40 changes: 40 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug Report
about: Create a report to help us improve

---

<!--
Have you read Cat Herder's Issue Guidelines? By filing an Issue, you are expected to comply with it (refer to the "Reporting Bugs" Section of the Guidelines), including treating everyone with respect: https://github.com/sweetrpg/CraftTracker/blob/master/.github/CONTRIBUTING.md
This header will not be reflected upon submitting this issue.
-->

## Environment And Mod Information:

* Minecraft Version: [i.e. 1.18.1]
* Forge Version: [i.e. 14.21.1.2443]
* Cat Herder Version: [i.e. 1.14.1.240]
* Java Version: [i.e. 8 Update 144 64 bit]
* Operating System (OS): [i.e. Windows 10 64-bit Build 17134]

## Logs


## Issue Description:



## Steps to reproduce:

1.
2.
3.
4.

## Additional Information:

- More Details:
- Screenshots:
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Feature Request
about: Suggest an idea for this project

---

<!--
Have you read Cat Talent's Issue Guidelines? By filing an Issue, you are expected to comply with it (refer to the "Reporting Bugs" Section of the Guidelines), including treating everyone with respect: https://github.com/Sweetrpg/CraftTracker/blob/master/.github/CONTRIBUTING.md
This header will not be reflected upon submitting this issue.
-->

## Feature Description:


## Relation to any Known/Unknown Bug:


## Additional Information:
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Build with Gradle
uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
with:
arguments: build test --console=version
arguments: build test --console=verbose
env:
MOD_VERSION: "${{ steps.bump_version.outputs.new_version }}"
- name: Commit version file
Expand Down
2 changes: 1 addition & 1 deletion .release-info/1.18/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.8
0.0.9
1 change: 1 addition & 0 deletions CHANGELOG/1.18/current.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- `[NEW]` First releasable build
20 changes: 2 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
classpath "org.ajoberstar.grgit:grgit-gradle:4.1.0"
classpath "org.ajoberstar.grgit:grgit-gradle:5.2.1"
classpath 'org.parchmentmc:librarian:1.+'
}
}
Expand Down Expand Up @@ -226,19 +226,3 @@ modrinth {
optional.project "patchouli"
}
}

// Must be done in afterEvaluate as the specific curseforge$id
// task is generated lazily
afterEvaluate {
// tasks.named("curseforge${project.curseforge_project_id}").get().dependsOn.add(makeChangelog)
}

if (project.hasProperty('UPDATE_MAPPINGS')) {
extractRangeMap {
sources sourceSets.api.java.srcDirs
}
applyRangeMap {
sources sourceSets.api.java.srcDirs
}
sourceSets.api.java.srcDirs.each { extractMappedNew.addTarget it }
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod_id=crafttracker
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false

forge_version=1.18.2-40.2.10
forge_version=1.18.2-40.2.17
mcp_channel=official
mcp_mappings=1.18.2
parchment_version=2022.11.06-1.18.2
Expand All @@ -19,7 +19,7 @@ base_mc_version=1.18
additional_mc_versions=1.18

fml_version_range=[40,)
forge_version_range=[40.2.0,)
forge_version_range=[40.2.17,)
minecraft_version_range=[1.18, 1.19)

curseforge_project_id=626455
Expand All @@ -35,5 +35,5 @@ jei_version=1.18.2:9.7.2.281
top_file_id=3671753

# Patchouli
ptch_version=1.18.2-67
ptch_version=1.18.2-71.1
ptch_file_id=3729975
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit e95038c

Please sign in to comment.