Fix a ZenScript parsing issue related to header

TerraFirmaRescue · May 7, 2021 · 2647122 · 2647122
1 parent d5b2d54
commit 2647122
Show file tree

Hide file tree

Showing 49 changed files with 261 additions and 226 deletions.
diff --git a/changelog_en_US.txt b/changelog_en_US.txt
@@ -1,3 +1,17 @@
+3.7.0.0
+Mod Changes:
+- Upgraded gregtech_1.7.10-6.15.08-unofficial
+
+Content Changes:
+- Now bedrock ores sometimes spawn with multiple types of ores (extremely rare).
+- Nerfed Bedrock Lava Springs in the Nether got nerfed to 500 times less Output. Only applies to newly generated ones.
+- Fluid Pipes will now show all Fluids that are currently somewhere within all connected Pipes, when hit with a Magnifying Glass.
+- Spray Cans can now be used to dye Sheep, Wolf Collars and Grass (if their Color is applicable).
+- Blue Spruce. it changes dirt and grass into Podzol, and becomes a Christmas Tree in certain periods of time.
+- When you break Fluid Pipes, they will try to move their content to connected adjacent Blocks/Pipes in order to not waste it.
+Keyword being TRY, because if there is nowhere to go they will still send it to the Garbage Dump.
+- Fixed the Stainless Steel, Ultimet, and Signalum alloying issue by changing their alloying recipes.
+
 3.6.0.1
 Mod Changes:
 - N/A

diff --git a/config/gregtech/worldgenerationnew.cfg b/config/gregtech/worldgenerationnew.cfg
@@ -446,14 +446,29 @@ worldgenerator {
 
             yellow {
                 B:Enabled_true=true
+
+                dim {
+                    B:DEFAULT_true=true
+                }
+
             }
 
             blue {
                 B:Enabled_true=true
+
+                dim {
+                    B:DEFAULT_true=true
+                }
+
             }
 
             white {
                 B:Enabled_true=true
+
+                dim {
+                    B:DEFAULT_true=true
+                }
+
             }
 
         }
@@ -2713,6 +2728,11 @@ worldgenerator {
                 B:IndicatorRocks_true=true
                 S:Ore_Coal=Coal
                 I:Probability_5000=5000
+
+                dim {
+                    B:DEFAULT_true=true
+                }
+
             }
 
             voidquartz {

diff --git a/docs/PLANETARY_SYSTEM.txt b/docs/PLANETARY_SYSTEM.txt
@@ -3,7 +3,7 @@
         ┣ Netheriat 狱星
         ┣ HD (无译名)
         ┣ Duck Egg 鸭蛋
-            ┣ Terrafirma 群峦(又译"泰拉孚马"）
+            ┣ Terrafirma 群峦
             ┣ Merganser 秋沙鸭
             ┣ Canary 金丝雀
             ┣ Golden Eagle 金雕
@@ -12,6 +12,7 @@
             ┣ Tragopan 角雉
             ┣ Ibis 朱鹭
             ┣ Black Stork 黑鹳
+            群峦，鸭，雀，雕，鹤，雉，鹭，鹳
         ┣ Evan 伊文
         ┗ Zthen 㻸
 

diff --git a/...ommon/scripts/.A_Guide_To_Contribution.zs → ...k/common/scripts/.A_Guide_To_Contribution b/...ommon/scripts/.A_Guide_To_Contribution.zs → ...k/common/scripts/.A_Guide_To_Contribution
diff --git a/modpack/common/scripts/AdvancedRocketry.zs b/modpack/common/scripts/AdvancedRocketry.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/AnvilMachineMaterial.zs b/modpack/common/scripts/AnvilMachineMaterial.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/AnvilOtherMaterial.zs b/modpack/common/scripts/AnvilOtherMaterial.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/AnvilPlans.zs b/modpack/common/scripts/AnvilPlans.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/AppliedEnergistics2.zs b/modpack/common/scripts/AppliedEnergistics2.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/Avaritia.zs b/modpack/common/scripts/Avaritia.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/Backpack.zs b/modpack/common/scripts/Backpack.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/BioCircuit.zs b/modpack/common/scripts/BioCircuit.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/Botania.zs b/modpack/common/scripts/Botania.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 // redstone root

diff --git a/modpack/common/scripts/Chisel2.zs b/modpack/common/scripts/Chisel2.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/Coins.zs b/modpack/common/scripts/Coins.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/CommonBotGT.zs b/modpack/common/scripts/CommonBotGT.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 recipes.remove(<gregtech:gt.multitileentity:32033>);

diff --git a/modpack/common/scripts/CommonConversions.zs b/modpack/common/scripts/CommonConversions.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/CommonGT.zs b/modpack/common/scripts/CommonGT.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/CommonIC2.zs b/modpack/common/scripts/CommonIC2.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/CommonMinecraft.zs b/modpack/common/scripts/CommonMinecraft.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */

diff --git a/modpack/common/scripts/CommonPtProcessing.zs b/modpack/common/scripts/CommonPtProcessing.zs
@@ -1,13 +1,13 @@
 /*
- * Original Author: TeamMoeg
- * https://teammoeg.com
+ * Original Author: TeamMoeg <teammoeg.com>
  *
  * This file is distributed as part of the Terrafirma: Rescue Modpack.
- * Visit the whole Project Source Code on Github:
- * https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack
+ * Visit the whole Project Source Code on Github.
  *
  * Terrafirma: Rescue is a Free and Open Source Software distributed under the
- * Terrafirma: Rescue License: https://github.com/TerraFirmaRescue/TerraFirma-Rescue-Modpack/blob/master/LICENSE
+ * Terrafirma: Rescue License.
+ *
+ * Visit <forum.teammoeg.com> to see the links to Github and License.
  */
 
 /* Import */