Skip to content

Commit

Permalink
Update to 1.17
Browse files Browse the repository at this point in the history
Update to Official classnames
Patchwork
Make the game compile and run
Merge in the new HUD overlay API
Merge in the new render properties API
PEEL
Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason.
New FML installer
Update to 1.17.1

Co-authored-by: LexManos <[email protected]>
Co-authored-by: SizableShrimp <[email protected]>
Co-authored-by: cpw <[email protected]>
Co-authored-by: Curle <[email protected]>
Co-authored-by: Unnoen <[email protected]>
Co-authored-by: covers1624 <[email protected]>
Co-authored-by: DaemonUmbra <[email protected]>
Co-authored-by: gigaherz <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
  • Loading branch information
8 people committed Jul 22, 2021
1 parent 064ae69 commit be5446b
Show file tree
Hide file tree
Showing 2,063 changed files with 42,106 additions and 43,989 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,24 @@

#idea
/.idea
/*/out
/classes
*.iml

#gradle
/build
/.gradle
/mdk/.gradle
/mdk/build
/*/build
/*/.gradle

#occupational hazards
# Projects repo, either ignore it, or ignore patches.
/projects/mcp/
/projects/clean/
/projects/forge/
/projects/fmlonly/
#/patches/

#occupational hazards
/projects/**/build/
/projects/**/out/
/projects/**/run/
Expand All @@ -31,16 +36,11 @@ src/generated/resources/.cache/

#Patch rejects
/patches-/
*.patch.rej
#*.patch.rej
/projects/*/rejects/

# FML changelog
changelog.txt
*.py
*.7z
/logs/

/projects/forge/rejects/

# Srg2Source causes import bugs on these patches. If you intentionnally change these, remove the ignore.
/patches/minecraft/net/minecraft/client/renderer/ViewFrustum.java.patch
/patches/minecraft/net/minecraft/data/BlockModelDefinition.java.patch
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pipeline {
}
agent {
docker {
image 'gradle:jdk8'
image 'gradle:7-jdk16'
args '-v forgegc:/home/gradle/.gradle/'
}
}
Expand Down Expand Up @@ -69,7 +69,7 @@ pipeline {
steps {
withCredentials([usernamePassword(credentialsId: 'maven-forge-user', usernameVariable: 'MAVEN_USER', passwordVariable: 'MAVEN_PASSWORD')]) {
withGradle {
sh './gradlew ${GRADLE_ARGS} :forge:publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
sh './gradlew ${GRADLE_ARGS} publish -PkeystoreKeyPass=${KEYSTORE_KEYPASS} -PkeystoreStorePass=${KEYSTORE_STOREPASS} -Pkeystore=${KEYSTORE} -PcrowdinKey=${CROWDIN}'
}
}
}
Expand All @@ -88,7 +88,7 @@ pipeline {
}
steps {
withGradle {
sh './gradlew ${GRADLE_ARGS} :forge:publish -PcrowdinKey=${CROWDIN}'
sh './gradlew ${GRADLE_ARGS} publish -PcrowdinKey=${CROWDIN}'
}
}
}
Expand Down
Loading

0 comments on commit be5446b

Please sign in to comment.