Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.2…

…0-lts
CyclopsMC · Nov 2, 2024 · 1cc86de · 1cc86de
2 parents 7f6ebe8 + 95925fa
commit 1cc86de
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/resources/changelog/1.19.2-1.6.0.txt b/resources/changelog/1.19.2-1.6.0.txt
@@ -0,0 +1,7 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Additions:
+* Trigger crafting jobs from JEI by Ctrl-clicking recipes, Closes CyclopsMC/IntegratedTerminals#127
+* Add dedicated support for EMI
+* Add dedicated support for REI
diff --git a/resources/changelog/1.19.2-1.6.1.txt b/resources/changelog/1.19.2-1.6.1.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix EMI crash if EmiSearchWidget is not present, Closes CyclopsMC/IntegratedTerminals#133
+
diff --git a/resources/changelog/1.19.2-1.6.2.txt b/resources/changelog/1.19.2-1.6.2.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix rare CME when switching terminal tabs, Closes #136
+
diff --git a/...in/java/org/cyclops/integratedterminals/network/packet/TerminalStorageChangeGuiState.java b/...in/java/org/cyclops/integratedterminals/network/packet/TerminalStorageChangeGuiState.java
@@ -26,7 +26,7 @@ public TerminalStorageChangeGuiState() {
     }
 
     public TerminalStorageChangeGuiState(TerminalStorageState state) {
-        this.state = state.getTag();
+        this.state = state.getTag().copy();
     }
 
     @Override