Integrate 1.12's #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…arity with 1.7.10 updates
- Update Gradle from 4.9 to 7.1 - Update from FG2 to FG3 - Switch to Kotlin Gradle DSL - Temporarily remove publishing stuff Signed-off-by: slava_110 <slava.hero@bk.ru>
Signed-off-by: slava_110 <slava.hero@bk.ru>
Signed-off-by: slava_110 <slava.hero@bk.ru>
- Removed more stuff from `@Mod` annotation. Everything is in `mcmod.info` now - Implemented optional composite build with libVulpes as dependency - Created new task (`build setup/cloneLibVulpes`) to clone libVulpes from github repo (will use link and branch from `gradle.properties` file) - Replaced strict dependency on libVulpes version with placeholder in `mcmod.info` - Added `libVulpes` folder to `.gitignore`
- Fixed libVulpes repository - Removed unused CurseForge repository
- Removed BBM-Dev property - Removed unused `buildNumber` variants
Transfer in the changes from "slava"
"Stable" branch, a very old thing, merged in to maintain it's useage
Integrate in the changes from Silfry-1.12
revert changes from the merge that are extraneus and/ or detrimental
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges in other branches for 1.12, to enforce compat. I hope