diff --git a/dependencies.gradle b/dependencies.gradle index 6eef8969..7a456c97 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ dependencies { - implementation('com.github.GTNewHorizons:Galacticraft:3.3.7-GTNH:dev') - implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.57-GTNH:dev') + implementation('com.github.GTNewHorizons:Galacticraft:3.4.15-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev') implementation('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:api') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.18:api') + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.48:api') + compileOnly('com.github.GTNewHorizons:EnderIO:2.10.12:api') compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly(deobf('https://s3.amazonaws.com/aidancbrady/mekanism/281-recommended/Mekanism-1.7.10-9.1.0.281.jar')) } diff --git a/gradle.properties b/gradle.properties index 2d919372..86ae8acf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -96,7 +96,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -151,7 +153,7 @@ modrinthProjectId = # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. @@ -172,6 +174,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. customArchiveBaseName = AmunRa-GC +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index ff436f2c..b4bf8556 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49' } diff --git a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java index af2f2e85..54957663 100755 --- a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java +++ b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java @@ -918,7 +918,7 @@ private static void initNasaWorkbenchCrafting() { final HashMap input = new HashMap<>(); if (AmunRa.isNHCoreLoaded && AmunRa.isASPLoaded) { - final ItemStack fins = GameRegistry.findItemStack("dreamcraft", "item.HeavyDutyRocketFinsTier4", 1); + final ItemStack fins = GameRegistry.findItemStack("dreamcraft", "HeavyDutyRocketFinsTier4", 1); // top row, single slot input.put(1, ARItems.noseCone.getItemStack(1)); @@ -948,7 +948,7 @@ private static void initNasaWorkbenchCrafting() { // last row input.put(16, shuttleLeg); // engine? - input.put(17, GameRegistry.findItemStack("dreamcraft", "item.HeavyDutyRocketEngineTier4", 1)); + input.put(17, GameRegistry.findItemStack("dreamcraft", "HeavyDutyRocketEngineTier4", 1)); input.put(18, shuttleLeg); } else { // top row, single slot