From 453b133eef2a1052db214b4ba2dff4679e5260d0 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:52:55 +0000 Subject: [PATCH 01/16] Update bundle_ru.properties --- bundles/bundle_ru.properties | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bundles/bundle_ru.properties b/bundles/bundle_ru.properties index e69fa50..cf2a32e 100644 --- a/bundles/bundle_ru.properties +++ b/bundles/bundle_ru.properties @@ -12,9 +12,9 @@ item.gittech-invar.name=Инвар item.gittech-steel.name=Сталь item.gittech-electronium.name=Электрониум item.gittech-iridium.name=Иридий -item.gittech-signal.name=Сигналовый +item.gittech-signal.name=Сигналий item.gittech-box.name=Коробка -item.gittech-ulti_raw.name=Ульти сырьё +item.gittech-ulti_raw.name=Ульти-сырьё item.gittech-gold-k.name=Кусочки золота item.gittech-iron-k.name=Кусочки железа item.gittech-nickel-k.name=Кусочки никеля @@ -34,7 +34,7 @@ liquid.gittech-invar-liquid.name=Расплавленный инвар liquid.gittech-silver-liquid.name=Расплавленное серебро liquid.gittech-electronium-liquid.name=Расплавленный электрониум liquid.gittech-platinum-liquid.name=Расплавленная платина -liquid.gittech-signal-liquid.name=Расплавленный сигнал +liquid.gittech-signal-liquid.name=Расплавленный сигналий liquid.gittech-nickel-liquid.name=Расплавленный никель liquid.gittech-diesel-liquid.name=Дизельное топливо liquid.gittech-lava-liquid.name=Лава @@ -43,7 +43,7 @@ liquid.gittech-lava-liquid.name=Лава block.gittech-gold-duo.name=Золотая двойная турель block.gittech-bronze-duo.name=Бронзовая двойная турель block.gittech-iron-duo.name=Железная двойная турель -block.gittech-silver-duo.name=Серебреная двойная турель +block.gittech-silver-duo.name=Серебряная двойная турель block.gittech-tin-duo.name=Оловяная двойная турель block.gittech-steel-duo.name=Стальная двойная турель block.gittech-gold-wall.name=Золотая стена @@ -52,23 +52,23 @@ block.gittech-bronze-wall.name=Бронзовая стена block.gittech-bronze-wall-large.name=Большая бронзовая стена block.gittech-iron-wall.name=Железная стена block.gittech-iron-wall-large.name=Большая железная стена -block.gittech-silver-wall.name=Серебреная стена -block.gittech-silver-wall-large.name=Большая серебреная стена +block.gittech-silver-wall.name=Серебряная стена +block.gittech-silver-wall-large.name=Большая серебряная стена block.gittech-steel-wall.name=Стальная стена block.gittech-steel-wall-large.name=Большая стальная стена block.gittech-tin-wall.name=Оловянная стена block.gittech-tin-wall-large.name=Большая оловянная стена -block.gittech-bronze-router.name=Бронзовый маршуторизатор -block.gittech-gold-router.name=Золотой маршуторизатор -block.gittech-iron-router.name=Железный маршуторизатор -block.gittech-tin-router.name=Оловянный маршуторизатор -block.gittech-silver-router.name=Серебряный маршуторизатор -block.gittech-steel-router.name=Стальной маршуторизатор +block.gittech-bronze-router.name=Бронзовый маршрутизатор +block.gittech-gold-router.name=Золотой маршрутизатор +block.gittech-iron-router.name=Железный маршрутизатор +block.gittech-tin-router.name=Оловянный маршрутизатор +block.gittech-silver-router.name=Серебряный маршрутизатор +block.gittech-steel-router.name=Стальной маршрутизатор block.gittech-bronze-distributor.name=Бронзовый разветвитель block.gittech-gold-distributor.name=Золотой разветвитель block.gittech-tin-distributor.name=Оловянный разветвитель block.gittech-iron-distributor.name=Железный разветвитель -block.gittech-silver-distributor.name=Серебренный разветвитель +block.gittech-silver-distributor.name=Серебряный разветвитель block.gittech-steel-distributor.name=Стальной разветвитель block.gittech-bronze-drill.name=Бронзовый бур block.gittech-gold-drill.name=Золотой бур @@ -79,12 +79,12 @@ block.gittech-silver-drill.name=Серебренный бур block.gittech-bronze-container.name=Бронзовый контейнер block.gittech-gold-container.name=Золотой контейнер block.gittech-tin-container.name=Оловянный контейнер -block.gittech-silver-container.name=Серебренный контейнер +block.gittech-silver-container.name=Серебрянный контейнер block.gittech-steel-container.name=Стальной контейнер block.gittech-iron-container.name=Железный контейнер //Zones name - Карта название -zone.gittech-silver-crags.name=Серебреный кратер +zone.gittech-silver-crags.name=Серебряные кратеры //Zones description - Карта описание -zone.gittech-silver-crags.description=Здесь можно добыть серебро или найти лаву! \ No newline at end of file +zone.gittech-silver-crags.description=Здесь можно добыть серебро. Ну или найти лаву! From 57bad37faebb3c4c757bd1ac1f1b935696c24ae9 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:57:39 +0000 Subject: [PATCH 02/16] Delete gold-drill.hjson --- content/blocks/drill/gold-drill.hjson | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 content/blocks/drill/gold-drill.hjson diff --git a/content/blocks/drill/gold-drill.hjson b/content/blocks/drill/gold-drill.hjson deleted file mode 100644 index 7a53861..0000000 --- a/content/blocks/drill/gold-drill.hjson +++ /dev/null @@ -1,23 +0,0 @@ -name:"Механический золотой бур" -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." -type:"Drill" -size:2 -health:180 -tier:2 -drawMineItem:true -drillTime:600 -itemCapacity:10 -rotateSpeed:2 -consumes:{ -liquid:{ -liquid:"water" -amount:0.05 -optional:true -booster:true -} -} -requirements:[ -gold/12 -] -research: mechanical-drill -category:"production" \ No newline at end of file From c75d4b6a2b2b374b5ee9450d9415dd76d3eeee49 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:58:05 +0000 Subject: [PATCH 03/16] Delete iron-drill.hjson --- content/blocks/drill/iron-drill.hjson | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 content/blocks/drill/iron-drill.hjson diff --git a/content/blocks/drill/iron-drill.hjson b/content/blocks/drill/iron-drill.hjson deleted file mode 100644 index 5532bb2..0000000 --- a/content/blocks/drill/iron-drill.hjson +++ /dev/null @@ -1,23 +0,0 @@ -name:"Механический железный бур" -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." -type:"Drill" -size:2 -health:220 -tier:4 -drawMineItem:true -drillTime:600 -itemCapacity:10 -rotateSpeed:2 -consumes:{ -liquid:{ -liquid:"water" -amount:0.05 -optional:true -booster:true -} -} -requirements:[ -iron/12 -] -research: bronze-drill -category:"production" \ No newline at end of file From 2503e500f0dd32b0e6fe371bd3c036252394aca6 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:58:23 +0000 Subject: [PATCH 04/16] Delete silver-drill.hjson --- content/blocks/drill/silver-drill.hjson | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 content/blocks/drill/silver-drill.hjson diff --git a/content/blocks/drill/silver-drill.hjson b/content/blocks/drill/silver-drill.hjson deleted file mode 100644 index 17b4c42..0000000 --- a/content/blocks/drill/silver-drill.hjson +++ /dev/null @@ -1,23 +0,0 @@ -name:"Механический серебреный бур" -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." -type:"Drill" -size:2 -health:190 -tier:4 -drawMineItem:true -drillTime:600 -itemCapacity:10 -rotateSpeed:2 -consumes:{ -liquid:{ -liquid:"water" -amount:0.05 -optional:true -booster:true -} -} -requirements:[ -silver/12 -] -research: gold-drill -category:"production" \ No newline at end of file From cdf88ec50e36a4ef65ac6d5c5c4924611db1c113 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:58:45 +0000 Subject: [PATCH 05/16] Delete steel-drill.hjson --- content/blocks/drill/steel-drill.hjson | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 content/blocks/drill/steel-drill.hjson diff --git a/content/blocks/drill/steel-drill.hjson b/content/blocks/drill/steel-drill.hjson deleted file mode 100644 index 6158c47..0000000 --- a/content/blocks/drill/steel-drill.hjson +++ /dev/null @@ -1,23 +0,0 @@ -name:"Механический стальной бур" -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." -type:"Drill" -size:2 -health:230 -tier:4 -drawMineItem:true -drillTime:600 -itemCapacity:10 -rotateSpeed:2 -consumes:{ -liquid:{ -liquid:"water" -amount:0.05 -optional:true -booster:true -} -} -requirements:[ -steel/12 -] -research: iron-drill -category:"production" \ No newline at end of file From 37ea76e2463d0ec58cf5095943b2ef214555f753 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 22:59:04 +0000 Subject: [PATCH 06/16] Delete tin-drill.hjson --- content/blocks/drill/tin-drill.hjson | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 content/blocks/drill/tin-drill.hjson diff --git a/content/blocks/drill/tin-drill.hjson b/content/blocks/drill/tin-drill.hjson deleted file mode 100644 index 481e284..0000000 --- a/content/blocks/drill/tin-drill.hjson +++ /dev/null @@ -1,23 +0,0 @@ -name:"Механический оловянный бур" -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." -type:"Drill" -size:2 -health:200 -tier:3 -drawMineItem:true -drillTime:600 -itemCapacity:10 -rotateSpeed:2 -consumes:{ -liquid:{ -liquid:"water" -amount:0.05 -optional:true -booster:true -} -} -requirements:[ -tin/12 -] -research: silver-drill -category:"production" \ No newline at end of file From 1abc00a7e3877a7601560a6b5d57a398a7372f8f Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:09:21 +0000 Subject: [PATCH 07/16] Added new drill --- content/blocks/drill/bronze-drill.hjson | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/content/blocks/drill/bronze-drill.hjson b/content/blocks/drill/bronze-drill.hjson index b15abe3..c3bfa57 100644 --- a/content/blocks/drill/bronze-drill.hjson +++ b/content/blocks/drill/bronze-drill.hjson @@ -1,13 +1,13 @@ -name: Bronze drill -description:"Дешёвый бур.\nПри размещении на соотвествующих плитках, предметы бесконечно выводяться в медленом темпе.\nСпособен добывать только базовые ресурсы." +name: Electronium drill +description:"Довольно дорогая дрель. Способна добывать все ресурсы. Из-за повышенной компактности и скорости добычи ресурсов, стоит дороже." type:"Drill" -size:2 -health:210 -tier:3 +size:3 +health:350 +tier:4 drawMineItem:true -drillTime:600 +drillTime:10 itemCapacity:10 -rotateSpeed:2 +rotateSpeed:4 consumes:{ liquid:{ liquid:"water" @@ -17,7 +17,11 @@ booster:true } } requirements:[ -bronze/12 +electronium/200; +copper/500; +lead/200; +thorium/100; +bronze/20; ] -research: tin-drill -category:"production" \ No newline at end of file +research: lazer-drill +category:"production" From aa6a205129d05e237fed95cbc015e27a51414db7 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:11:52 +0000 Subject: [PATCH 08/16] Delete tin-conveyor.hjson --- content/blocks/conveyor/tin-conveyor.hjson | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 content/blocks/conveyor/tin-conveyor.hjson diff --git a/content/blocks/conveyor/tin-conveyor.hjson b/content/blocks/conveyor/tin-conveyor.hjson deleted file mode 100644 index bc7e020..0000000 --- a/content/blocks/conveyor/tin-conveyor.hjson +++ /dev/null @@ -1,10 +0,0 @@ -type: "Conveyor" -name: "Оловянный конвеер" -description: "" -health:45 -requirements:[ -tin/1 -] -category: "distribution" -speed: 0.11 -research: "titanium-conveyor" \ No newline at end of file From 239f66fdf7259e34e8ec2e7dd9d4e709b73faf70 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:12:04 +0000 Subject: [PATCH 09/16] Delete tin-bridge.hjson --- content/blocks/conveyor/tin-bridge.hjson | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 content/blocks/conveyor/tin-bridge.hjson diff --git a/content/blocks/conveyor/tin-bridge.hjson b/content/blocks/conveyor/tin-bridge.hjson deleted file mode 100644 index 00ce225..0000000 --- a/content/blocks/conveyor/tin-bridge.hjson +++ /dev/null @@ -1,14 +0,0 @@ -name: Оловянный мостовой конвейер -description: Улучшенная версия мостового конвейера. -type: ItemBridge -range: 7 -health:80 -transportTime: 0.5 -itemCapacity: 20 -hasPower: false -requirements: [ - tin/15 - copper/ 10 - thorium/10 -] -category: distribution \ No newline at end of file From cac81c5b45d3e9ccfba3ab48d663a960ee88d440 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:12:31 +0000 Subject: [PATCH 10/16] Delete steel-conveyor.hjson --- content/blocks/conveyor/steel-conveyor.hjson | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 content/blocks/conveyor/steel-conveyor.hjson diff --git a/content/blocks/conveyor/steel-conveyor.hjson b/content/blocks/conveyor/steel-conveyor.hjson deleted file mode 100644 index 014237c..0000000 --- a/content/blocks/conveyor/steel-conveyor.hjson +++ /dev/null @@ -1,10 +0,0 @@ -type: "Conveyor" -name: "Стальной конвеер" -description: "" -health:45 -requirements:[ -steel/1 -] -category: "distribution" -speed: 0.11 -research: "titanium-conveyor" \ No newline at end of file From 82a34bdd22408c876eb25fb6e139b22094bfba5e Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:14:10 +0000 Subject: [PATCH 11/16] Delete steel-bridge.hjson --- content/blocks/conveyor/steel-bridge.hjson | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 content/blocks/conveyor/steel-bridge.hjson diff --git a/content/blocks/conveyor/steel-bridge.hjson b/content/blocks/conveyor/steel-bridge.hjson deleted file mode 100644 index fa16b90..0000000 --- a/content/blocks/conveyor/steel-bridge.hjson +++ /dev/null @@ -1,14 +0,0 @@ -name: Стальной мостовой конвейер -description: Улучшенная версия мостового конвейера. -type: ItemBridge -range: 10 -health:110 -transportTime: 0.5 -itemCapacity: 20 -hasPower: false -requirements: [ - steel/15 - copper/ 10 - thorium/10 -] -category: distribution \ No newline at end of file From c9a24fac23d492352c10f1bbd9fa6d8dc8956c92 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:14:24 +0000 Subject: [PATCH 12/16] Delete silver-conveyor.hjson --- content/blocks/conveyor/silver-conveyor.hjson | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 content/blocks/conveyor/silver-conveyor.hjson diff --git a/content/blocks/conveyor/silver-conveyor.hjson b/content/blocks/conveyor/silver-conveyor.hjson deleted file mode 100644 index 2e3e8b9..0000000 --- a/content/blocks/conveyor/silver-conveyor.hjson +++ /dev/null @@ -1,10 +0,0 @@ -type: "Conveyor" -name: "Серебреная конвеер" -description: "" -health:45 -requirements:[ -silver/1 -] -category: "distribution" -speed: 0.11 -research: "titanium-conveyor" \ No newline at end of file From 625a752e27274f152222ea4720c3c17fc0d1e248 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:15:04 +0000 Subject: [PATCH 13/16] Delete silver-bridge.hjson --- content/blocks/conveyor/silver-bridge.hjson | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 content/blocks/conveyor/silver-bridge.hjson diff --git a/content/blocks/conveyor/silver-bridge.hjson b/content/blocks/conveyor/silver-bridge.hjson deleted file mode 100644 index 1b7dbfa..0000000 --- a/content/blocks/conveyor/silver-bridge.hjson +++ /dev/null @@ -1,14 +0,0 @@ -name: Серебренный мостовой конвейер -description: Улучшенная версия мостового конвейера. -type: ItemBridge -range: 6 -health:70 -transportTime: 0.5 -itemCapacity: 20 -hasPower: false -requirements: [ - silver/15 - copper/ 10 - thorium/10 -] -category: distribution \ No newline at end of file From 4b6930b2b0d4b84a3a6cb56af775e777df0f2681 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:15:16 +0000 Subject: [PATCH 14/16] Delete iron-conveyor.hjson --- content/blocks/conveyor/iron-conveyor.hjson | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 content/blocks/conveyor/iron-conveyor.hjson diff --git a/content/blocks/conveyor/iron-conveyor.hjson b/content/blocks/conveyor/iron-conveyor.hjson deleted file mode 100644 index 5ac96e9..0000000 --- a/content/blocks/conveyor/iron-conveyor.hjson +++ /dev/null @@ -1,10 +0,0 @@ -type: "Conveyor" -name: "Железный конвеер" -description: "" -health:45 -requirements:[ -iron/1 -] -category: "distribution" -speed: 0.11 -research: "titanium-conveyor" \ No newline at end of file From 68778d436d3d29944532a905879fcb8c9ea1597b Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:15:35 +0000 Subject: [PATCH 15/16] Delete iron-bridge.hjson --- content/blocks/conveyor/iron-bridge.hjson | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 content/blocks/conveyor/iron-bridge.hjson diff --git a/content/blocks/conveyor/iron-bridge.hjson b/content/blocks/conveyor/iron-bridge.hjson deleted file mode 100644 index 8595b2c..0000000 --- a/content/blocks/conveyor/iron-bridge.hjson +++ /dev/null @@ -1,14 +0,0 @@ -name: Железный мостовой конвейер -description: Улучшенная версия мостового конвейера. -type: ItemBridge -range: 9 -health:100 -transportTime: 0.5 -itemCapacity: 20 -hasPower: false -requirements: [ - iron/15 - copper/ 10 - thorium/10 -] -category: distribution \ No newline at end of file From 71337310c8bb20b3d35d341770ba0bf89a8067f7 Mon Sep 17 00:00:00 2001 From: Timarrr <49357813+Timarrr@users.noreply.github.com> Date: Fri, 12 Jun 2020 23:19:40 +0000 Subject: [PATCH 16/16] Update and rename bronze-bridge.hjson to electronium-bridge.hjson --- content/blocks/conveyor/bronze-bridge.hjson | 14 -------------- content/blocks/conveyor/electronium-bridge.hjson | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 content/blocks/conveyor/bronze-bridge.hjson create mode 100644 content/blocks/conveyor/electronium-bridge.hjson diff --git a/content/blocks/conveyor/bronze-bridge.hjson b/content/blocks/conveyor/bronze-bridge.hjson deleted file mode 100644 index f5eef78..0000000 --- a/content/blocks/conveyor/bronze-bridge.hjson +++ /dev/null @@ -1,14 +0,0 @@ -name: Бронзовый мостовой конвейер -description: Улучшенная версия мостового конвейера. -type: ItemBridge -range: 8 -health:90 -transportTime: 0.5 -itemCapacity: 14 -hasPower: false -requirements: [ - bronze/15 - copper/ 10 - thorium/10 -] -category: distribution \ No newline at end of file diff --git a/content/blocks/conveyor/electronium-bridge.hjson b/content/blocks/conveyor/electronium-bridge.hjson new file mode 100644 index 0000000..1d5a349 --- /dev/null +++ b/content/blocks/conveyor/electronium-bridge.hjson @@ -0,0 +1,16 @@ +name: Электрониумовый мостовой конвейер +description: Улучшенная версия мостового конвейера. Требует электричество, скорость выше фазового конвейера. +type: ItemBridge +range: 10 +health: 120 +transportTime: 0.005 +itemCapacity: 20 +hasPower: true +requirements: [ + bronze/15 + copper/10 + thorium/10 + electronium/25 + phase-weave/25 +] +category: distribution