Merge branch 'master' into dev

# Conflicts:
#	dependencies.gradle
#	src/main/java/com/glodblock/github/inventory/gui/GuiType.java
This commit is contained in:
Martin Robertz committed 2025-05-31 14:56:22 +02:00
commit 60838676c2
1 file changed
+3 -3
+3 -3
View File
@@ -35,7 +35,7 @@
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.7.49-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-622-GTNH-pre:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-626-GTNH:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.8.7:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.25:dev")
@@ -48,7 +48,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.10:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.9.16:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.314:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.328:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
}
@@ -57,7 +57,7 @@ dependencies {
compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.15-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.66:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.69:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
}