Merge remote-tracking branch 'origin/master-1.20-lts' into master-1.21

CyclopsMC · Jul 20, 2024 · 09efefc · 09efefc
2 parents c68e843 + 5e3e959
commit 09efefc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/resources/changelog/1.19.2-1.0.4.txt b/resources/changelog/1.19.2-1.0.4.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix config file not being generated, Closes #14
+
diff --git a/resources/changelog/1.20.1-1.0.4.txt b/resources/changelog/1.20.1-1.0.4.txt
@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.0 or higher.
+
+Fixes:
+* Fix config file not being generated, Closes #14
+
diff --git a/src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java b/src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java
@@ -148,6 +148,8 @@ protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTa
     protected void onConfigsRegister(ConfigHandler configHandler) {
         super.onConfigsRegister(configHandler);
 
+        configHandler.addConfigurable(new GeneralConfig());
+
         configHandler.addConfigurable(new ItemScriptingDiskConfig());
 
         configHandler.addConfigurable(new BlockScriptingDriveConfig());