upstream/StructureLib
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/StructureLib.git synced 2026-11-12 16:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
Dream Master committed 2025-08-04 10:30:11 +07:00
2 parents 6de4676338 6283931667
commit 3787ead03b
2 files changed
+19 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+2 -2
View File
@@ -2,12 +2,12 @@
dependencies {
api("com.github.GTNewHorizons:GTNHLib:0.6.38:dev")
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev")
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.69-GTNH:dev")
testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.391:dev") {
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.420:dev") {
// exclude group: "com.github.GTNewHorizons", module: "StructureLib"
// }
}
dependencies.gradle.orig
+17
View File
@@ -0,0 +1,17 @@
// Add your dependencies here
dependencies {
api("com.github.GTNewHorizons:GTNHLib:0.6.38:dev")
<<<<<<< HEAD
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev")
=======
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.69-GTNH:dev")
>>>>>>> master
testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.391:dev") {
// exclude group: "com.github.GTNewHorizons", module: "StructureLib"
// }
}