Merge remote-tracking branch 'origin/3.x' into 3.x

4 files changed, 40 insertions, 3 deletions

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
new file mode 100644
index 000000000..49d95f07e
--- /dev/null
+++ b/.github/workflows/gradle.yml
@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: ./gradlew clean build
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 000000000..688fb4deb
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 077cce647..768c97dbd 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -205,7 +205,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         final Identifier recipeButtonTex = new Identifier("textures/gui/recipe_button.png");
         AtomicLong lastSync = new AtomicLong(-1);
         ClothClientHooks.SYNC_RECIPES.register((minecraftClient, recipeManager, synchronizeRecipesS2CPacket) -> {
-            if (lastSync.get() > 0 && System.currentTimeMillis() - lastSync.get() > 5000) {
+            if (lastSync.get() > 0 && System.currentTimeMillis() - lastSync.get() <= 5000) {
                 RoughlyEnoughItemsCore.LOGGER.warn("[REI] Suppressing Sync Recipes!");
                 return;
             }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 141ab48f8..632df23b3 100755
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -46,7 +46,7 @@
   "custom": {
     "rei:translators": {
       "English": "Danielshe",
-      "Japanese": "swordglowsblue",
+      "Japanese": ["swordglowsblue", "hinataaki"],
       "Simplified Chinese": ["XuyuEre", "Danielshe"],
       "Traditional Chinese": ["hugoalh", "gxy17886", "Danielshe"],
       "French": "Yanis48",
@@ -56,7 +56,8 @@
       "LOLCAT": "Danielshe",
       "Upside Down English": "Danielshe",
       "Brazilian Portuguese": ["thiagokenis", "joaoh1"],
-      "Bulgarian": "geniiii"
+      "Bulgarian": "geniiii",
+      "Russian": "MrYonter"
     }
   }
 }