diff --git a/.gitignore b/.gitignore
index 40fb5e4a..e4380dee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*.json
 *.bat
+layout.json
diff --git a/dependencies.gradle b/dependencies.gradle
index 458177ae..c66a4ef4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,23 +2,22 @@
 
 dependencies {
     implementation("com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev")
-    implementation("com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev")
-    implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev")
-	implementation("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev")
+    implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev")
+    implementation("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev")
 
     compileOnly("org.projectlombok:lombok:1.18.24")
     annotationProcessor("org.projectlombok:lombok:1.18.24")
 
-    devOnlyNonPublishable("com.github.GTNewHorizons:waila:1.8.2:dev") {
+    devOnlyNonPublishable("com.github.GTNewHorizons:waila:1.8.4:dev") {
         transitive = false
     }
-    devOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.2.1-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:WailaHarvestability:1.3.2-GTNH:dev")
 
     compileOnly("curse.maven:ee3-65509:2305023") {  // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-beta28:api") {
+    compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-beta40:api") {
         transitive = false
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 4864feef..9d613a70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ modId = chisel
 modGroup = com.cricketcraft.chisel
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b95..9bbc975c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2847c82..37f853b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..faf93008 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/settings.gradle b/settings.gradle
index 7a562ea1..ff436f2c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.31'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
 }
 
 
diff --git a/src/main/java/team/chisel/inventory/ContainerChisel.java b/src/main/java/team/chisel/inventory/ContainerChisel.java
index 0c6570a6..ddf247c2 100644
--- a/src/main/java/team/chisel/inventory/ContainerChisel.java
+++ b/src/main/java/team/chisel/inventory/ContainerChisel.java
@@ -96,6 +96,7 @@ public class ContainerChisel extends Container {
             itemstack = itemstack1.copy();
 
             if (slotIdx > InventoryChiselSelection.normalSlots) {
+                // clicked in player inventory
                 if (!this.mergeItemStack(
                     itemstack1,
                     InventoryChiselSelection.normalSlots,
@@ -104,10 +105,13 @@ public class ContainerChisel extends Container {
                     return null;
                 }
             } else {
-                entity.inventory.setItemStack(itemstack1.copy());
-                slot.onPickupFromSlot(entity, itemstack1);
-                itemstack1 = entity.inventory.getItemStack();
-                entity.inventory.setItemStack(null);
+                // only run this logic if a chisel selection slot was clicked (i.e. not the input slot)
+                if (slotIdx != InventoryChiselSelection.normalSlots) {
+                    entity.inventory.setItemStack(itemstack1.copy());
+                    slot.onPickupFromSlot(entity, itemstack1);
+                    itemstack1 = entity.inventory.getItemStack();
+                    entity.inventory.setItemStack(null);
+                }
 
                 if (!this.mergeItemStack(
                     itemstack1,