Skip to content

Commit a4e9e53

Browse files
authored
Merge branch 'master' into master
2 parents 0f0e2cd + e377a8d commit a4e9e53

15 files changed

+171
-74
lines changed

dependencies.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
// Add your dependencies here
22

33
dependencies {
4-
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.150:dev")
4+
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.167:dev")
55
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
66
api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
77

8-
implementation("com.github.GTNewHorizons:GTNHLib:0.6.11:dev")
8+
implementation("com.github.GTNewHorizons:GTNHLib:0.6.13:dev")
99

1010
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.1:dev") { transitive = false }
1111
compileOnly("com.github.GTNewHorizons:Avaritia:1.61:dev") { transitive = false }
1212
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.5:dev") { transitive = false }
13-
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.33:dev") { transitive = false }
13+
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.35:dev") { transitive = false }
1414
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
1515
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.9-GTNH:dev") { transitive = false }
1616
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
1717
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
1818
compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")
1919
compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
20-
compileOnly("com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev") { transitive = false }
20+
compileOnly("com.github.GTNewHorizons:Botania:1.12.6-GTNH:dev") { transitive = false }
2121
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
2222
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
2323
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
2424
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
25-
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false }
26-
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.2:dev") { transitive = false }
25+
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.5-GTNH:dev") { transitive = false }
26+
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") { transitive = false }
2727
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.22-GTNH:dev") { transitive = false }
28-
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.1-GTNH:dev")
28+
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
2929
//compileOnly("com.github.Roadhog360:Et-Futurum-Requiem:2.6.2:dev") { transitive = false }
3030

3131
runtimeOnlyNonPublishable rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
32-
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.1-GTNH:dev")
32+
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.2-GTNH:dev")
3333

3434
// Core unit testing platform
3535
testImplementation(platform('org.junit:junit-bom:5.9.2'))

gradle.properties

+2-11
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,13 @@ generateGradleTokenClass = com.dreammaster.lib.BuildVersion
5555
# Name of the token containing the project's current version to generate/replace.
5656
gradleTokenVersion = VERSION
5757

58-
# [DEPRECATED] Mod ID replacement token.
59-
gradleTokenModId =
60-
61-
# [DEPRECATED] Mod name replacement token.
62-
gradleTokenModName =
63-
64-
# [DEPRECATED] Mod Group replacement token.
65-
gradleTokenGroupName =
66-
6758
# [DEPRECATED]
6859
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
6960
# public static final String VERSION = "GRADLETOKEN_VERSION";
7061
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
7162
# version in @Mod([...], version = VERSION, [...]).
7263
# Leave these properties empty to skip individual token replacements.
73-
replaceGradleTokenInFile =
64+
# replaceGradleTokenInFile =
7465

7566
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
7667
# leave this property empty.
@@ -80,7 +71,7 @@ apiPackage =
8071
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
8172
# There can be multiple files in a space-separated list.
8273
# Example value: mymodid_at.cfg nei_at.cfg
83-
accessTransformersFile =
74+
accessTransformersFile = dreamcraft_at.cfg
8475

8576
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
8677
usesMixins = true

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37'
2121
}
2222

2323

src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java

+8
Original file line numberDiff line numberDiff line change
@@ -1146,6 +1146,14 @@ public void run() {
11461146
GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
11471147
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C',
11481148
OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) });
1149+
GTModHandler.addCraftingRecipe(
1150+
GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W),
1151+
bits,
1152+
new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H',
1153+
OrePrefixes.stick.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), 'B',
1154+
GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E',
1155+
GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P',
1156+
OrePrefixes.plate.get(Materials.Steel) });
11491157

11501158
if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe(
11511159
GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0),

0 commit comments

Comments
 (0)