diff --git a/.gitignore b/.gitignore
index d9ac69212..a862b184c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ run/
 out/
 /bin/
 logs/
+**/.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37d180e86..6968fe660 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Changed
 
 - Improved Performance for grid updates
+- Fixed incorrect autocrafting keybind prompt on macOS
+- Added Japanese translations for certain autocrafting actions
 - Improved waterlogging to behave more like vanilla
 - Added Forge relocation and Packing Tape blacklist tag entries to prevent block movement
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java
index 0b89a868f..ec8527b13 100644
--- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java
+++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferCraftingGridError.java
@@ -16,6 +16,7 @@ import java.util.List;
 public class RecipeTransferCraftingGridError implements IRecipeTransferError {
     protected static final Color AUTOCRAFTING_HIGHLIGHT_COLOR = new Color(0.0f, 0.0f, 1.0f, 0.4f);
     private static final Color MISSING_HIGHLIGHT_COLOR = new Color(1.0f, 0.0f, 0.0f, 0.4f);
+    private static final boolean HOST_OS_IS_MACOS = System.getProperty("os.name").equals("Mac OS X");
     protected final IngredientTracker tracker;
 
     public RecipeTransferCraftingGridError(IngredientTracker tracker) {
@@ -59,7 +60,11 @@ public class RecipeTransferCraftingGridError implements IRecipeTransferError {
         }
 
         if (craftMessage) {
-            message.add(new TranslatableComponent("gui.refinedstorage.jei.transfer.request_autocrafting").withStyle(ChatFormatting.BLUE));
+            if (HOST_OS_IS_MACOS) {
+                message.add(new TranslatableComponent("gui.refinedstorage.jei.transfer.request_autocrafting_mac").withStyle(ChatFormatting.BLUE));
+            } else {
+                message.add(new TranslatableComponent("gui.refinedstorage.jei.transfer.request_autocrafting").withStyle(ChatFormatting.BLUE));
+            }
         }
 
         return message;
diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json
index 658cbb6e4..997a36f98 100644
--- a/src/main/resources/assets/refinedstorage/lang/en_us.json
+++ b/src/main/resources/assets/refinedstorage/lang/en_us.json
@@ -90,6 +90,7 @@
   "gui.refinedstorage.alternatives.apply": "Apply",
   "gui.refinedstorage.jei.transfer.autocrafting_available": "Autocrafting available",
   "gui.refinedstorage.jei.transfer.request_autocrafting": "CTRL + CLICK to request autocrafting",
+  "gui.refinedstorage.jei.transfer.request_autocrafting_mac": "CMD + CLICK to request autocrafting",
   "misc.refinedstorage.energy_stored": "%d / %d FE",
   "misc.refinedstorage.energy_usage": "Usage: %d FE/t",
   "misc.refinedstorage.energy_usage_minimal": "%d FE/t",
diff --git a/src/main/resources/assets/refinedstorage/lang/it_IT.json b/src/main/resources/assets/refinedstorage/lang/it_IT.json
index c02db0c72..f5ef27234 100644
--- a/src/main/resources/assets/refinedstorage/lang/it_IT.json
+++ b/src/main/resources/assets/refinedstorage/lang/it_IT.json
@@ -88,6 +88,7 @@
   "gui.refinedstorage.alternatives.apply": "Applica",
   "gui.refinedstorage.jei.transfer.autocrafting_available": "Fabbricazione automatica disponibile",
   "gui.refinedstorage.jei.transfer.request_autocrafting": "CTRL + CLICK per richiedere la fabbricazione automatica",
+  "gui.refinedstorage.jei.transfer.request_autocrafting_mac": "CMD + CLICK per richiedere la fabbricazione automatica",
   "misc.refinedstorage.energy_stored": "%d / %d FE",
   "misc.refinedstorage.energy_usage": "Utilizzo: %d FE/t",
   "misc.refinedstorage.energy_usage_minimal": "%d FE/t",
diff --git a/src/main/resources/assets/refinedstorage/lang/ja_jp.json b/src/main/resources/assets/refinedstorage/lang/ja_jp.json
index 0d0dd9c5f..02667b22f 100644
--- a/src/main/resources/assets/refinedstorage/lang/ja_jp.json
+++ b/src/main/resources/assets/refinedstorage/lang/ja_jp.json
@@ -88,7 +88,9 @@
   "gui.refinedstorage.crafter_manager": "クラフターマネージャー",
   "gui.refinedstorage.alternatives": "代替案",
   "gui.refinedstorage.alternatives.apply": "適用",
-
+  "gui.refinedstorage.jei.transfer.autocrafting_available": "自動クラフトが出来る",
+  "gui.refinedstorage.jei.transfer.request_autocrafting": "CTRLキーを押しながらクリックするために自動クラフトする",
+  "gui.refinedstorage.jei.transfer.request_autocrafting_mac": "CMDキーを押しながらクリックするために自動クラフトする",
   "misc.refinedstorage.energy_stored": "%d / %d FE",
   "misc.refinedstorage.energy_usage": "消費電力: %d FE/t",
   "misc.refinedstorage.energy_usage_minimal": "%d FE/t",
diff --git a/src/main/resources/assets/refinedstorage/lang/ko_kr.json b/src/main/resources/assets/refinedstorage/lang/ko_kr.json
index 0b09cadb3..ab27ce45f 100644
--- a/src/main/resources/assets/refinedstorage/lang/ko_kr.json
+++ b/src/main/resources/assets/refinedstorage/lang/ko_kr.json
@@ -90,6 +90,7 @@
   "gui.refinedstorage.alternatives.apply": "적용",
   "gui.refinedstorage.jei.transfer.autocrafting_available": "자동 제작 사용 가능",
   "gui.refinedstorage.jei.transfer.request_autocrafting": "CTRL + 클릭하여 자동 제작 요청",
+  "gui.refinedstorage.jei.transfer.request_autocrafting_mac": "CMD + 클릭하여 자동 제작 요청",
   "misc.refinedstorage.energy_stored": "%d / %d FE",
   "misc.refinedstorage.energy_usage": "사용: %d FE/t",
   "misc.refinedstorage.energy_usage_minimal": "%d FE/t",
diff --git a/src/main/resources/assets/refinedstorage/lang/pl_pl.json b/src/main/resources/assets/refinedstorage/lang/pl_pl.json
index 9775d6049..35e591a03 100644
--- a/src/main/resources/assets/refinedstorage/lang/pl_pl.json
+++ b/src/main/resources/assets/refinedstorage/lang/pl_pl.json
@@ -90,6 +90,7 @@
     "gui.refinedstorage.alternatives.apply": "Zastosuj",
     "gui.refinedstorage.jei.transfer.autocrafting_available": "Auto-wytwarzanie dostępne",
     "gui.refinedstorage.jei.transfer.request_autocrafting": "CTRL + KLIKNIJ aby zażądać wytworzenia",
+    "gui.refinedstorage.jei.transfer.request_autocrafting_mac": "CMD + KLIKNIJ aby zażądać wytworzenia",
     "misc.refinedstorage.energy_stored": "%d / %d FE",
     "misc.refinedstorage.energy_usage": "Zużycie: %d FE/t",
     "misc.refinedstorage.energy_usage_minimal": "%d FE/t",