Merge reinforced rails into mc1.15/dev

build.gradle

@@ -118,6 +118,7 @@ dependencies {
 }
 
 jar {
+    classifier = 'slim'
     manifest {
         attributes([
             "Specification-Title": "create",
@@ -132,6 +133,7 @@ jar {
 }
 
 shadowJar {
+    classifier = ''
     configurations = [project.configurations.shade]
     relocate 'com.tterrag.registrate', 'com.simibubi.create.repack.registrate'
 }
@@ -153,7 +155,7 @@ String getChangelogText() {
             def temp = it
             if (lineCount == 0) {
                 temp = "Create ${version}"
-                temp = "<h2 style=\"display:inline;\">$temp </h2><em>for Minecraft ${minecraft_version}</em><br/>"
+                temp = "<span style=\"font-size: 18px; color: #333399;\">Create v${mod_version}</span>&nbsp;&nbsp;<em>for Minecraft ${minecraft_version}</em><br/>"
             } else if (it.startsWith('-')) {
                 temp = "&nbsp;&nbsp;&nbsp;$temp<br/>"
                 temp = temp.replaceAll("(\\S+\\/\\S+)#([0-9]+)\\b", "<a href=\"https://github.com/\$1/issues/\$2\">\$0</a>");
@@ -163,14 +165,17 @@ String getChangelogText() {
             }
             str += temp
             lineCount++
-            return
         } else {
+            str += "<p>Please submit any Issues you come across on the&nbsp;<a href=\"https://github.com/${github_project}/issues\" rel=\"nofollow\">Issue Tracker</a>.</p>"
             done = true
         }
     }
     return str
 }
 
+//changelog debugging
+//new File("changelog.html").write getChangelogText()
+
 tasks.curseforge.enabled = !dev && project.hasProperty('simi_curseforge_key')
     
 curseforge {
@@ -183,7 +188,7 @@ curseforge {
         changelog = System.getenv('CHANGELOG') == null || System.getenv('CHANGELOG').equals('none') ? getChangelogText() : System.getenv('CHANGELOG')
         changelogType = 'html'
         releaseType = project.curse_type
-        mainArtifact(jar) {
+        mainArtifact(shadowJar) {
             displayName = "Create - ${version}"
         }
         relations {

changelog.txt

@@ -1,3 +1,24 @@
+0.2.4c:
+A hotfix for our dear users over in Multiplayer.
+Fixes
+- (0.2.4b) Fixed server crash when Cart Assembler accelerates held Minecarts
+- Fixed build errors of previous version
+
+0.2.4a:
+Just a few Bug-Fixes since the recent 1.15 release. Enjoy!
+Fixes
+- Fixed pistons moving at inconsistent speeds, overshooting their bounds
+- Fixed belts not moving entities
+- Fixed diagonal belts teleporting entities miles away
+- Fixed tree fertilizer not working
+- Patched some localization gaps
+- Fixed pulley placing down ropes when destroyed while moving
+- Fixed inconsistencies with glue removal and placement
+- Fixed crash when placing a crafter between two colliding rotation sources
+- Fixed cases of self-powering loops caused by blocks rotated using the wrench
+- Fixed Extendo Grip animation for left-handed players
+- Fixed encoding of degree symbols in tooltips
+
 0.2.4:
 Welcome to the future! Glad you are still here.
 Warning

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # mod version info
-mod_version=0.2.4
+mod_version=0.2.4c
 minecraft_version=1.15.2
 forge_version=31.2.3
 
@@ -17,4 +17,4 @@ projectId=328085
 curse_type=beta
 
 # github information
-github_project=Creators-of-Create/Create 
+github_project=Creators-of-Create/Create

src/main/java/com/simibubi/create/Create.java

@@ -38,7 +38,7 @@ public class Create {
 
 	public static final String ID = "create";
 	public static final String NAME = "Create";
-	public static final String VERSION = "0.2.4";
+	public static final String VERSION = "0.2.4c";
 
 	public static Logger logger = LogManager.getLogger();
 	public static ItemGroup baseCreativeTab = new CreateItemGroup();