v2.8.2-luajit: Merge remote-tracking branch 'origin/master' into luajit

MCJack123 · Apr 22, 2024 · cca7cc0 · cca7cc0
2 parents 92aa74e + 053ce11
commit cca7cc0
Show file tree

Hide file tree

Showing 32 changed files with 2,254 additions and 2,531 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -110,7 +110,7 @@ jobs:
     - name: Download ROM & CC:T
       run: |
         sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
-        git clone --branch v1.20.1-1.109.2 https://github.com/cc-tweaked/CC-Tweaked ../CC-Tweaked
+        git clone --branch v1.20.1-1.110.2 https://github.com/cc-tweaked/CC-Tweaked ../CC-Tweaked
         patch -p1 -d ../CC-Tweaked < resources/CCT-Tests.patch
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -164,6 +164,7 @@ jobs:
       run: |
         git config --global user.name "GitHub Actions"
         git config --global user.email "<>"
+        git add .
         git commit -m $GITHUB_REF
         git push origin master
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -90,7 +90,7 @@
         "valarray": "cpp",
         "csetjmp": "cpp"
     },
-    "C_Cpp.default.cppStandard": "c++14",
+    "C_Cpp.default.cppStandard": "c++17",
     "C_Cpp.default.cStandard": "c11",
     "lldb.displayFormat": "auto",
     "lldb.showDisassembly": "auto",

diff --git a/api/generic_peripheral/inventory.hpp b/api/generic_peripheral/inventory.hpp
@@ -68,7 +68,7 @@ class inventory : public peripheral {
             else src = p, dest = this;
 
             if (fromSlot < 1 || fromSlot > src->size()) return luaL_error(L, "From slot out of range (between 1 and %d)", src->size());
-            if (!lua_isnil(L, 4) && (toSlot < 1 || toSlot > dest->size())) return luaL_error(L, "To slot out of range (between 1 and %d)", dest->size());
+            if (!lua_isnoneornil(L, 4) && (toSlot < 1 || toSlot > dest->size())) return luaL_error(L, "To slot out of range (between 1 and %d)", dest->size());
             if (limit <= 0) {
                 lua_pushinteger(L, 0);
                 return 1;
@@ -103,4 +103,4 @@ class inventory : public peripheral {
     }
 };
 
-#endif
+#endif