Merge branch 'GregTechCEu:1.20.1' into 1.20.1

Author: iouter

.github/ISSUE_TEMPLATE/000-bug-report.yml

@@ -2,6 +2,22 @@ name: Bug Report
 description: Report a bug where something is not working as expected.
 labels: [ "bug" ]
 body:
+  - type: checkboxes
+    id: existing-issue
+    attributes:
+      label: Checked for existing issues
+      description: You have checked for existing reports of this issue, open or closed.
+      options:
+        - label: "I have checked for existing issues, and have found none."
+          required: true
+  - type: checkboxes
+    id: tried-latest
+    attributes:
+      label: Tested latest version
+      description: You have checked that this issue occurs on the latest version of GTCEu.
+      options:
+        - label: "I have checked that this occurs on the latest version."
+          required: true
   - type: input
     id: version
     attributes:
@@ -41,6 +57,14 @@ body:
         - "Unsure"
     validations:
       required: true
+  - type: textarea
+    id: other-mods
+    attributes:
+      label: Other Installed Mods
+      description: List all mods you have installed here, or the name of the modpack you're playing.
+      placeholder: "Example: ATM9, Embeddium, NuclearCraft Neoteric, AE2..."
+    validations:
+      required: true
   - type: textarea
     id: expected
     attributes:

.github/pull_request_template.md

@@ -0,0 +1,18 @@
+## What
+_This section describes what this PR is about. It should be a clear and concise description concerning what this PR is for, why this PR is needed, and why it should be accepted._
+_Linking an issue can be used alternatively to writing a description._
+
+## Implementation Details
+_Any implementations in this PR that should be carefully looked over, or that could/should have alternate solutions proposed._
+
+## Outcome
+_A short description of what this PR added/fixed/changed/removed._
+_For correct linking of issues please use any of the Closes/Fixes/Resolves keywords. Example: When a PR is fixing a bug use "Fixes: #number-of-bug"_
+
+## Additional Information
+_This section is for screenshots to demonstrate any GUI or rendering changes, or any other additional information that reviewers should be aware of._
+
+## Potential Compatibility Issues
+_This section is for defining possible compatibility issues. It must be used when there are API changes, item/block/material/machine changes, or recipe changes._
+
+**Please fill in as much useful information as possible. Also, please remove all unused sections, including this and the other explanations.**

CHANGELOG.md

@@ -1,6 +1,17 @@
 # ChangeLog
 
-Version: 1.1.2.a
+Version: 1.1.3.a
+
+### ADDITIONS:
+- added Creative Chest, Creative Tank
 
 ### FIXES:
-- fixed crash when opening a GUI with many slots
+- fixed crashes related to KubeJS recipe loading
+- fixed ore block maceration not working
+- fixed high tier tools (duranium, neutronium) not working
+- fixed electric furnace / multismelter recipes not working
+- fixed transformers always having 1A storage
+
+### CHANGES:
+- replaced Tungstensteel coils with RTM-Alloy coils 
+- updated Russian translation

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.1.2.a
+mod_version = 1.1.3.a
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

gradle/scripts/dependencies.gradle

@@ -31,8 +31,8 @@ dependencies {
     modApi(include("com.tterrag.registrate:Registrate:${forge.versions.registrate.get()}"))
 
     // Create and its dependencies
-    modImplementation("com.simibubi.create:create-${libs.versions.minecraft.get()}:${forge.versions.createForge.get()}:all") { transitive = false }
-    modImplementation forge.flywheel
+    modCompileOnly("com.simibubi.create:create-${libs.versions.minecraft.get()}:${forge.versions.createForge.get()}:all") { transitive = false }
+    modCompileOnly forge.flywheel
 
     // JEI
     modCompileOnly(forge.jei.common.api) { transitive = false }

src/generated/resources/assets/gtceu/compass/nodes/blocks/coil_block.json

@@ -7,7 +7,7 @@
     "gtceu:cupronickel_coil_block",
     "gtceu:kanthal_coil_block",
     "gtceu:nichrome_coil_block",
-    "gtceu:tungstensteel_coil_block",
+    "gtceu:rtm_alloy_coil_block",
     "gtceu:hssg_coil_block",
     "gtceu:naquadah_coil_block",
     "gtceu:trinium_coil_block",

src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json

@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/basalt",
   "position": [
-    -150,
+    -50,
     50
   ],
   "pre_nodes": [

src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json

@@ -117,8 +117,8 @@
   ],
   "page": "gtceu:generation/deepslate",
   "position": [
-    -100,
-    50
+    -150,
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"

src/generated/resources/assets/gtceu/compass/nodes/generation/diorite.json

@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/diorite",
   "position": [
-    -150,
+    -200,
     150
   ],
   "pre_nodes": [

src/generated/resources/assets/gtceu/compass/nodes/generation/endstone.json

@@ -118,7 +118,7 @@
   "page": "gtceu:generation/endstone",
   "position": [
     -200,
-    150
+    100
   ],
   "pre_nodes": [
     "gtceu:generation/ore"