From 0a7d5b20c79add34d0f1260eed2e0cede287fcd9 Mon Sep 17 00:00:00 2001
From: Tegas Aziz <49786146+WilloIzCitron@users.noreply.github.com>
Date: Sat, 5 Jun 2021 05:18:40 +0700
Subject: [PATCH 1/2] 7.0 Indonesian Bundle (#5349)

* 7.0 Indonesian Bundles

* Update bundle_in_ID.properties

* small additions
---
 core/assets/bundles/bundle_in_ID.properties | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
index da3a524ae7..437c6a07fc 100644
--- a/core/assets/bundles/bundle_in_ID.properties
+++ b/core/assets/bundles/bundle_in_ID.properties
@@ -626,6 +626,7 @@ status.wet.name = Basah
 status.muddy.name = Berlumpur
 status.melting.name = Meleleh
 status.sapped.name = Melemahkan
+status.electrified.name = Dialiri listrik
 status.spore-slowed.name = Spora Melambat
 status.tarred.name = Berminyak
 status.overclock.name = Melebihi Batas
@@ -1060,6 +1061,11 @@ unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.sei.name = Sei
 unit.omura.name = Omura
+unit.retusa.name = Retusa
+unit.oxynoe.name = Oxynoe
+unit.cyerce.name = Cyerce
+unit.aegires.name = Aegires
+unit.navanax.name = Navanax
 unit.alpha.name = Alpha
 unit.beta.name = Beta
 unit.gamma.name = Gamma
@@ -1120,6 +1126,7 @@ block.sand-water.name = Air Pasir
 block.darksand-water.name = Air Pasir Hitam
 block.char.name = Bara
 block.dacite.name = Dasit
+block.rhyolite.name = Riolit
 block.dacite-wall.name = Dinding Dasit
 block.dacite-boulder.name = Batu Besar Dasit
 block.ice-snow.name = Salju Es
@@ -1227,6 +1234,7 @@ block.solar-panel.name = Panel Surya
 block.solar-panel-large.name = Panel Surya Besar
 block.oil-extractor.name = Pengekstrak Minyak
 block.repair-point.name = Tempat Perbaikan
+block.repair-turret.name = Menara Pembaikan
 block.pulse-conduit.name = Selang Denyut
 block.plated-conduit.name = Pipa Terlapis
 block.phase-conduit.name = Selang Phase
@@ -1269,6 +1277,12 @@ block.exponential-reconstructor.name = Rekonstruktor Eksponensial
 block.tetrative-reconstructor.name = Rekonstruktor Tetratif
 block.payload-conveyor.name = Pengantar Massa
 block.payload-router.name = Pengarah Massa
+block.duct.name = Saluran
+block.duct-router.name = Pengarah Saluran
+block.duct-bridge.name = Jembatan Saluran
+block.payload-propulsion-tower.name = Menara Penggerak Muatan
+block.payload-void.name = Penghilang Muatan
+block.payload-source.name = Sumber Muatan
 block.disassembler.name = Pembongkar
 block.silicon-crucible.name = Pelebur Raksasa
 block.overdrive-dome.name = Kubah Projektor Pemercepat

From 5f28e261761d61deeb0c56b1fd128a57895d6527 Mon Sep 17 00:00:00 2001
From: Volas171 <admin@o7fire.tk>
Date: Fri, 4 Jun 2021 18:17:53 -0500
Subject: [PATCH 2/2] Add Mindustrypvp.ml to 7.0 BE list (#5360)

* yeet

* lol almost forgot that
---
 servers_be.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/servers_be.json b/servers_be.json
index a510096842..00d82b09bc 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -13,5 +13,8 @@
   },
   {
     "address": "46.17.104.254:9999"
+  },
+  {
+    "address": "mindustrypvp.ml:6000"
   }
 ]