spicy1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 1.17.1
+* Take fluids out of generators - DStrand1
+* Part sharing - DStrand1
+
 ### 1.17.1
 * Added warning to controller if Turbine is obstructed (#1710) - ALongStringOfNumbers
 * Updated fetching of dimensions in worldgen to catch late registrations (#1709) - ALongStringOfNumbers

SPICY_ADDITIONS.md

@@ -0,0 +1,8 @@
+## Additions in the Spicy Version
+
+- Hatch Sharing
+ - Multiblocks can now share multiblock parts
+ - Rotor Holder and Coke Oven Hatch are blocked, as are any multiblock parts from addons
+ - Textures will NOT change when the multiblock is deformed as a result
+- Fluids can now be taken out of Single-Block Generators
+- Single-Block Generators now accept Fluids from items every tick (instead of every 5 ticks)

build.gradle.kts

@@ -384,6 +384,7 @@ fun getVersionFromJava(file: File): String {
  var major = "0"
  var minor = "0"
  var revision = "0"
+ var spicyver = "0"
 
  val prefix = "public static final int"
  file.forEachLine { line ->
@@ -397,6 +398,7 @@ fun getVersionFromJava(file: File): String {
  pts[0] == "MAJOR" -> major = pts[pts.size - 1]
  pts[0] == "MINOR" -> minor = pts[pts.size - 1]
  pts[0] == "REVISION" -> revision = pts[pts.size - 1]
+ pts[0] == "SPICY_VER" -> spicyver = pts[pts.size - 1]
  }
  }
  }
@@ -408,7 +410,7 @@ fun getVersionFromJava(file: File): String {
 
  val build = getBuildNumber()
 
- return "$major.$minor.$revision.$build"
+ return "$major.$minor.$revision.$build-spicy$spicyver"
 }
 
 fun CurseExtension.project(config: CurseProject.() -> Unit) = CurseProject().also {

src/main/java/gregtech/GregTechVersion.java

@@ -12,6 +12,8 @@ public final class GregTechVersion {
  //This number is incremented every build, and never reset. Should always be 0 in the repo code.
  public static final int BUILD = 0;
 
+ public static final int SPICY_VER = 1;
+
  public static final Version VERSION = new Version(MAJOR, MINOR, REVISION, BUILD);
 
  private GregTechVersion() {