From 01fb918cfc63481efee05698917fed8a7d49835d Mon Sep 17 00:00:00 2001
From: KhottyManatee55 <67944172+KhottyManatee55@users.noreply.github.com>
Date: Fri, 12 Mar 2021 22:16:24 +0300
Subject: [PATCH 1/2] Russian translation

---
 .../resources/assets/carryon/lang/ru_ru.json     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/main/resources/assets/carryon/lang/ru_ru.json

diff --git a/src/main/resources/assets/carryon/lang/ru_ru.json b/src/main/resources/assets/carryon/lang/ru_ru.json
new file mode 100644
index 0000000..3e39655
--- /dev/null
+++ b/src/main/resources/assets/carryon/lang/ru_ru.json
@@ -0,0 +1,16 @@
+{
+    "carryon.category.settings": "Настройки",
+    "carryon.category.blacklist": "Чёрный список",
+    "carryon.category.modeloverrides": "Переопределения модели (Улучшенное)",
+    "carryon.category.custompickupconditions": "Индивидуальные условия поднятия (Улучшенное)",
+    "carryon.category.whitelist": "Белый список",
+
+    "carryon.general.modeloverrides.modeloverrides": "Переопределения модели",
+    "carryon.general.blacklist.forbiddenentities": "Сущности, которых игрок не может поднять",
+    "carryon.general.blacklist.forbiddentiles": "Блоки, которые игрок не может поднять",
+    "carryon.category.custompickupconditions.custompickupconditionsblocks": "Пользовательские условия поднятия блока",
+    "carryon.category.custompickupconditions.custompickupconditionsentities": "Пользовательские условия поднятия сущности",
+
+    "key.carry.desc": "Поднять",
+    "key.carry.category": "Carry On"
+}

From bb9c321a42cd734af483810fc42029ddd1692570 Mon Sep 17 00:00:00 2001
From: Jared <jaredlll08@gmail.com>
Date: Sat, 12 Jun 2021 03:52:27 +0200
Subject: [PATCH 2/2] Future proof Jenkinsfile

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c6d9f45..7e17a5d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,6 +2,9 @@
 
 pipeline {
     agent any
+    tools {
+        jdk "jdk8u292-b10"
+    }
     stages {
         stage('Clean') {
             steps {
@@ -26,4 +29,4 @@ pipeline {
             archive 'build/libs/**.jar'
         }
     }
-}
\ No newline at end of file
+}