From 1348c9b6c919607847d714929ecfa826d3903223 Mon Sep 17 00:00:00 2001
From: DreamMasterXXL <dream-master@gmx.net>
Date: Sat, 22 May 2021 23:29:54 +0200
Subject: fix(texture): deprecated use of CASING_BLOCKS Update to GTNH's
 Gregtech

---
 src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
index 6742e7c229..eaa711a3a0 100644
--- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
+++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java
@@ -390,10 +390,10 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem
     @SuppressWarnings("ALL")
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         if(aSide == aFacing){
-            if(aActive) return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44],new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE)};
-            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44],new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT)};
+            if(aActive) return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(44),new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE)};
+            return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(44),new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT)};
         }
-        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44]};
+        return new ITexture[]{Textures.BlockIcons.getCasingTextureForId(44)};
     }
 
     @Override
-- 
cgit 


From e1e18b69fcec10d389e40934b19737854ca06cbc Mon Sep 17 00:00:00 2001
From: Léa Gris <lea.gris@noiraude.net>
Date: Sat, 22 May 2021 23:19:31 +0200
Subject: fix(gradle): various gradle and gitignore fixes

make gradlew wrapper executable
update the grgit gradle pluggin
correctly ignore IDEA project files in .gitignore

(cherry picked from commit 8514fdddf0d66ec334a0ee7c1c3ae8ae389ab193)
---
 .gitignore   | 5 ++---
 build.gradle | 4 +++-
 gradlew      | 0
 3 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/.gitignore b/.gitignore
index 408854fdd0..3aefee90dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 *.bat
 .gradle/
-Good-Generator.iml
-Good-Generator.ipr
-Good-Generator.iws
 .idea/
 out/
 *.iml
+*.ipr
+*.iws
diff --git a/build.gradle b/build.gradle
index 4c1ab145a5..b1299babfb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,9 @@ buildscript {
 }
 
 plugins {
-    id("org.ajoberstar.grgit") version("3.1.1")
+  // project.grgit is not available and the repository we're working in is not 
+  // interacted with: 
+  id 'org.ajoberstar.grgit' version '4.0.2' apply false
 }
 
 apply plugin: 'forge'
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
-- 
cgit