Merge commit '8ffae868ea0bdb85676dcea7953af2da74d03d87' into 2.9

Author: tier940

.github/workflows/publish.yml

@@ -82,15 +82,16 @@ jobs:
           modrinth-id: ${{ env.MODRINTH_PROJECT_ID }}
           modrinth-token: "${{ secrets.MODRINTH_API_KEY }}"
           modrinth-dependencies: |
-            8PB5NZf9(required)
-            vaQ5bJYU(required)
-            MeXYT7nJ(required)
+            G1ckZuWK(required)
+            tULldUx4(required)
+            tZiutdLG(required)
           curseforge-id: ${{ env.CURSEFORGE_PROJECT_ID }}
           curseforge-token: "${{ secrets.CURSEFORGE_API_KEY }}"
           curseforge-dependencies: |
             mixin-booter(required)
             gregtech-ce-unofficial(required)
             gregicality-multiblocks(required)
+            implosionnobomb(recommended)
             ae2-extended-life(recommended)
             ae-additions-extra-cells-2-fork(recommended)
             nae2(recommended)

CHANGELOG.md

@@ -1,3 +1,28 @@
+# v2.3.2
+- Fix BlastTemperature of Vacuum Freezer Extended Recipes.
+
+* * *
+
+# v2.3.1
+- Hotfix a mistake when splitting into INBs [#296](https://github.com/GTModpackTeam/GTExpert-Core/pull/296)
+
+* * *
+
+# v2.3.0
+- Separate Electric Implosion Compressor changes to [ImplosionNoBomb](https://www.curseforge.com/minecraft/mc-mods/implosionnobomb)
+    - Thanks to @MrKono for his support!!
+
+* * *
+
+# v2.2.14
+## Ender IO
+- Fix Black Paper
+
+## GregTech Food Options
+- Kitchen Recipe
+
+* * *
+
 # v2.2.13
 - Fix upgrade recipe to Nano Boots from Piston Boots.
 

build.gradle

@@ -1,8 +1,8 @@
-//version: 1723428048
+//version: 1725973221
 /*
  * DO NOT CHANGE THIS FILE!
  * Also, you may replace this file at any time if there is an update available.
- * Please check https://github.com/GregTechCEu/Buildscripts/blob/master/build.gradle for updates.
+ * Please check https://github.com/GTModpackTeam/Buildscripts/blob/master/build.gradle for updates.
  * You can also run ./gradlew updateBuildScript to update your buildscript.
  */
 
@@ -1423,11 +1423,11 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
 }
 
 static URL availableBuildScriptUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/build.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/build.gradle")
 }
 
 static URL availableSettingsGradleUrl() {
-    new URL("https://raw.githubusercontent.com/GregTechCEu/Buildscripts/master/settings.gradle")
+    new URL("https://raw.githubusercontent.com/GTModpackTeam/Buildscripts/master/settings.gradle")
 }
 
 boolean performBuildScriptUpdate() {
@@ -1476,8 +1476,8 @@ tasks.register('faq') {
                 "To add new repositories to your project, place them in 'repositories.gradle'.\n" +
                 "If you need additional gradle code to run, you can place it in a file named 'addon.gradle' (or either of the above, up to you for organization).\n\n" +
                 "If your build fails to recognize the syntax of newer Java versions, enable Jabel in your 'gradle.properties' under the option name 'enableModernJavaSyntax'.\n" +
-                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/jabel.md\n\n" +
-                "Report any issues or feature requests you have for this build script to https://github.com/GregTechCEu/Buildscripts/issues\n")
+                "To see information on how to configure your IDE properly for Java 17, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/jabel.md\n\n" +
+                "Report any issues or feature requests you have for this build script to https://github.com/GTModpackTeam/Buildscripts/issues\n")
     }
 }
 
@@ -1495,7 +1495,7 @@ def getFile(String relativePath) {
 
 def checkPropertyExists(String propertyName) {
     if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GregTechCEu/Buildscripts/blob/main/gradle.properties")
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTModpackTeam/Buildscripts/blob/main/gradle.properties")
     }
 }
 

dependencies.gradle

@@ -21,7 +21,7 @@
  *
  *  - shadowapi("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name
  *       Requires you to enable usesShadowedDependencies in gradle.properties
- *       For more info, see https://github.com/GregTechCEu/Buildscripts/blob/master/docs/shadow.md
+ *       For more info, see https://github.com/GTModpackTeam/Buildscripts/blob/master/docs/shadow.md
  *
  * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed,
  * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful.
@@ -40,17 +40,16 @@
 dependencies {
     // Published dependencies
     api("codechicken:codechickenlib:3.2.3.358") // CCL 3.2.3.358
-    api("com.cleanroommc:modularui:2.5.0-rc1") { transitive = false } // MUI 2.5.0-rc1
-    api("com.cleanroommc:groovyscript:1.1.2") { transitive = false } // GrS 1.1.2
+    api("com.cleanroommc:modularui:2.5.0-rc3") { transitive = false } // MUI 2.5.0-rc3
+    api("com.cleanroommc:groovyscript:1.2.0-hotfix1") { transitive = false } // GrS 1.2.0-hotfix1
     api("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700") // CrT 4.1.20.700
     api rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
 
     // Hard Dependencies
-    //devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
-    devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.9.0-beta-dev.jar"))) // CEu pr 2.9.0
-    //devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
-    devOnlyNonPublishable(rfg.deobf(project.files("libs/GregicalityMultiblocks-1.3.0-dev.jar"))) // GCYM pr 1.3.0
-    devOnlyNonPublishable(rfg.deobf("curse.maven:shadowfacts-forgelin-248453:2785465")) // Forgelin 1.8.4
+    devOnlyNonPublishable(rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5519022")) // CEu 2.8.10
+    //devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar"))) // CEu pr 2.8.10
+    devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
+    devOnlyNonPublishable(rfg.deobf("curse.maven:forgelin-continuous-456403:6142081")) // Forgelin-Continuous 2.1.10.0
 
     // Switchable Dependencies
     if (project.useAE2uelExtended.toBoolean()) {
@@ -59,7 +58,18 @@ dependencies {
         devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
     }
 
-    // Debug AE Additions
+    // Debug GTWoodProcessing
+    if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
+    }
+
+    // Debug ImplosionNoBomb
+    compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5731331") // ImplosionNoBomb 1.1.0
+    if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
+    }
+
+    // Debug ExtraCells2 Additions
     if (project.debug_all.toBoolean() || project.debug_aea.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8
     }
@@ -86,27 +96,6 @@ dependencies {
         }
     }
 
-    // Debug Forestry
-    compileOnly rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-    compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-    if (project.debug_all.toBoolean() || project.debug_ffm.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:forestry-59751:2684780") // Forestry 5.8.2.387
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5
-
-        // Debug Gendustry
-        if (project.debug_all.toBoolean() || project.debug_gendustry.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:gendustry-jei-addon-301364:2609434") // Gendustry JEI Addon 1.0.2
-        }
-
-        // Debug Binnies
-        if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) {
-            runtimeOnlyNonPublishable rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
-        }
-    }
-
     // Debug EnderIO
     compileOnly "info.loenwind.autoconfig:AutoConfig:1.12.2-1.0.2" // AutoConfig 1.0.2
     compileOnly "info.loenwind.autosave:AutoSave:1.12.2-1.0.11" // AutoSave 1.0.11
@@ -143,7 +132,7 @@ dependencies {
 
     // Debug Avaritia
     if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-kedition-913129:4777278") // Avaritia 1.1x Kedition 1.3
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6092956") // Avaritia UEL 3.3.0.41
     }
 
     // Debug Chisel

gradle.properties

@@ -3,11 +3,11 @@ modName = GTExpertCore
 # This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = gtexpert
 
-modGroup = gtexpert
+modGroup = com.github.gtexpert.core
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.2.13-beta
+modVersion = 2.4.5-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -27,14 +27,13 @@ useAE2uelExtended = false
 
 # Debug mod compatibility
 debug_all = false
+debug_gtwp = false
+debug_inb = false
 debug_aea = false
 debug_nae2 = false
 debug_extracpus = false
 debug_thaumcraft = false
 debug_thaumenergy = false
-debug_ffm = false
-debug_gendustry = false
-debug_binnies = false
 debug_eio = false
 debug_deda = false
 debug_avaritia = false
@@ -60,7 +59,7 @@ enableModernJavaSyntax = true
 enableJava17RunTasks = false
 
 # Generate a class with String fields for the mod id, name and version named with the fields below
-generateGradleTokenClass = gtexpert.Tags
+generateGradleTokenClass = com.github.gtexpert.core.Tags
 gradleTokenModId = MODID
 gradleTokenModName = MODNAME
 gradleTokenVersion = VERSION
@@ -190,7 +189,7 @@ mavenArtifactGroup =
 
 # Enable spotless checks
 # Enforces code formatting on your source code
-# By default this will use the files found here: https://github.com/GregTechCEu/Buildscripts/tree/master/spotless
+# By default this will use the files found here: https://github.com/GTModpackTeam/Buildscripts/tree/master/spotless
 # to format your code. However, you can create your own version of these files and place them in your project's
 # root directory to apply your own formatting options instead.
 enableSpotless = true

settings.gradle

@@ -20,6 +20,17 @@ plugins {
     id 'com.diffplug.blowdryerSetup' version '1.7.0'
     // Automatic toolchain provisioning
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+    id 'com.gradle.enterprise' version '3.18.1'
+}
+
+gradleEnterprise {
+    if (System.getenv("CI") != null) {
+        buildScan {
+            publishAlways()
+            termsOfServiceUrl = "https://gradle.com/terms-of-service"
+            termsOfServiceAgree = "yes"
+        }
+    }
 }
 
 blowdryerSetup {

spotless.importorder

@@ -6,4 +6,4 @@
 4=com
 5=gregtech
 6=gregicality
-7=gtexpert
+7=com.github.gtexpert