Skip to content

Commit

Permalink
Revert "Merge branch '1.17' into 1.18"
Browse files Browse the repository at this point in the history
This reverts commit a4169dc, reversing
changes made to f42525f.
  • Loading branch information
CodeF53 committed Apr 16, 2022
1 parent c30f589 commit 4cf1d63
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: build
run: ./gradlew build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '16' }} # Only upload artifacts built from latest java on one OS
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v2
with:
name: Artifacts
Expand Down
15 changes: 7 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.64
loader_version=0.12.5
# check these on https://fabricmc.net/develop/
minecraft_version=1.18
yarn_mappings=1.18+build.1
loader_version=0.13.3

# Mod Properties
mod_version = 1.2.3
maven_group = com.HorseBuff
archives_base_name = HorseBuff

# Dependencies
fabric_version=0.41.0+1.17
cloth_config_version=5.0.38
mod_menu_version=2.0.14

fabric_version=0.46.6+1.18
cloth_config_version=6.0.42
mod_menu_version=3.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ public int netherPortalTime(int constant){
}
return constant;
}
}
}
6 changes: 3 additions & 3 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
],

"depends": {
"fabricloader": ">=0.11.3",
"minecraft": "1.17.x",
"java": ">=16",
"fabricloader": ">=0.13.3",
"minecraft": "1.18.x",
"java": ">=17"
}
}

0 comments on commit 4cf1d63

Please sign in to comment.