From b12fac3aef9df24f4a12e69e18c9091efbe5d905 Mon Sep 17 00:00:00 2001 From: Elixias <61173114+LixieWulf@users.noreply.github.com> Date: Sat, 4 May 2024 07:18:59 -0600 Subject: [PATCH 1/5] i fix bug heheheheheheheeeeh (#9808) --- core/src/mindustry/world/blocks/environment/TallBlock.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/environment/TallBlock.java b/core/src/mindustry/world/blocks/environment/TallBlock.java index d2ca5bd004..f9384ff98f 100644 --- a/core/src/mindustry/world/blocks/environment/TallBlock.java +++ b/core/src/mindustry/world/blocks/environment/TallBlock.java @@ -10,6 +10,7 @@ import mindustry.world.*; public class TallBlock extends Block{ public float shadowOffset = -3f; public float layer = Layer.power + 1; + public float shadowLayer = Layer.power - 1; public float rotationRand = 20f; public float shadowAlpha = 0.6f; @@ -30,14 +31,14 @@ public class TallBlock extends Block{ public void drawBase(Tile tile){ float rot = Mathf.randomSeedRange(tile.pos() + 1, rotationRand); - Draw.z(Layer.power - 1); + Draw.z(shadowLayer); Draw.color(0f, 0f, 0f, shadowAlpha); Draw.rect(variants > 0 ? variantShadowRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantShadowRegions.length - 1))] : customShadowRegion, tile.worldx() + shadowOffset, tile.worldy() + shadowOffset, rot); Draw.color(); - Draw.z(Layer.power + 1); + Draw.z(layer); Draw.rect(variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region, tile.worldx(), tile.worldy(), rot); } From c64afa925ecb66c4faa7b52c9e9eff8faf040fa8 Mon Sep 17 00:00:00 2001 From: summoner001 Date: Sat, 4 May 2024 15:21:44 +0200 Subject: [PATCH 2/5] Update bundle_hu.properties (#9807) 1) Follow changes to the English language file and translate it into Hungarian. 2) Translation into Hungarian of the quantitative adjectives that are usually omitted. --- core/assets/bundles/bundle_hu.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 80fe97b252..361d02cfa4 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -702,9 +702,9 @@ objective.destroyblock = [accent]Semmisítsd meg:\n[]{0}[lightgray]{1} objective.destroyblocks = [accent]Semmisítsd meg: [lightgray]{0}[white]/{1}\n{2}[lightgray]{3} objective.item = [accent]Termelj: [][lightgray]{0}[]/{1}\n{2}[lightgray]{3} objective.coreitem = [accent]Szállítás a támaszpontba:\n[][lightgray]{0}[]/{1}\n{2}[lightgray]{3} -objective.build = [accent]Építs: [][lightgray]{0}[]\n{1}[lightgray]{2} -objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]\n{1}[lightgray]{2} -objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[] egységet +objective.build = [accent]Építs: [][lightgray]{0}[]db\n{1}[lightgray]{2} +objective.buildunit = [accent]Gyárts egységeket: [][lightgray]{0}[]db\n{1}[lightgray]{2} +objective.destroyunits = [accent]Semmisíts meg: [][lightgray]{0}[]db egységet objective.enemiesapproaching = [accent]Ellenség érkezik: [lightgray]{0}[] mp múlva objective.enemyescelating = [accent]Az ellenséges gyártás fokozódik: [lightgray]{0}[] mp múlva objective.enemyairunits = [accent]Az ellenséges légi egységek gyártása elkezdődik: [lightgray]{0}[] mp múlva @@ -992,7 +992,7 @@ stat.abilities = Képességek stat.canboost = Erősíthető stat.flying = Repül stat.ammouse = Lőszerhasználat -stat.ammocapacity = Ammo Capacity +stat.ammocapacity = Lőszerkapacitás stat.damagemultiplier = Sebzésszorzó stat.healthmultiplier = Életerőszorzó stat.speedmultiplier = Sebességszorzó @@ -1086,15 +1086,15 @@ bullet.armorpierce = [stat]páncéltörő bullet.maxdamagefraction = [stat]{0}%[lightgray] sebzési határérték bullet.suppression = [stat]{0} mp[lightgray] javításelnyomás ~[stat]{1}[lightgray] csempe bullet.interval = [stat]{0}/mp[lightgray] gyakoriságú lövedékek: -bullet.frags = [stat]{0}[lightgray]x repeszlövedék: -bullet.lightning = [stat]{0}[lightgray]x villámcsapás ~[stat]{1}[lightgray] sebzés +bullet.frags = [stat]{0}[lightgray]db repeszlövedék: +bullet.lightning = [stat]{0}[lightgray]db villámcsapás ~[stat]{1}[lightgray] sebzés bullet.buildingdamage = [stat]{0}%[lightgray] épületsebzés bullet.knockback = [stat]{0}[lightgray] hátralökés bullet.pierce = [stat]{0}[lightgray]x átütő erő bullet.infinitepierce = [stat]átütő erő bullet.healpercent = [stat]{0}%[lightgray] javítás bullet.healamount = [stat]{0}[lightgray] közvetlen javítás -bullet.multiplier = [stat]{0}[lightgray]x lőszerszorzó +bullet.multiplier = [stat]{0}[lightgray] lőszer/nyersanyag bullet.reload = [stat]{0}%[lightgray] tüzelési sebesség bullet.range = [stat]{0}[lightgray] csempés hatótáv @@ -1119,7 +1119,7 @@ unit.items = nyersanyag unit.thousands = k unit.millions = mil unit.billions = Mrd -unit.shots = shots +unit.shots = lövés unit.pershot = /lövés category.purpose = Rendeltetés category.general = Általános From ab002b7984a2a2198acf6995adaeebc24aec15ad Mon Sep 17 00:00:00 2001 From: NealRead <160118416+NealRead@users.noreply.github.com> Date: Sat, 4 May 2024 20:42:29 +0700 Subject: [PATCH 3/5] Update servers_v7.json (#9809) * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 4d2295d0bf..d88b3545ed 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -289,6 +289,10 @@ "name": "MineCore", "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, + { + "name": "Neither", + "address": ["178.20.45.59"] + }, { "name": "Mindus•VN", "address": ["alpha.ateex.cloud:19172"] From ee1072883438fbf9d05d5921b3840b874a52ff07 Mon Sep 17 00:00:00 2001 From: GaviTSRA <61122293+GaviTSRA@users.noreply.github.com> Date: Sat, 4 May 2024 17:29:38 +0200 Subject: [PATCH 4/5] Update servers_v7.json - Add TSR Custom Server (#9810) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index d88b3545ed..9ed1c73c76 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,7 +1,7 @@ [ { "name": "TSR Network", - "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250", "de-prem-01.hosts.optikservers.com:27526", "de-prem-01.hosts.optikservers.com:35376"] + "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250", "de-prem-01.hosts.optikservers.com:27526", "de-prem-01.hosts.optikservers.com:35376", "de-prem-01.hosts.optikservers.com:35895"] }, { "name": "Toast Mindustry", From afdf77427832d2bde693df0a7f09026778304401 Mon Sep 17 00:00:00 2001 From: NealRead <160118416+NealRead@users.noreply.github.com> Date: Mon, 6 May 2024 00:49:57 +0700 Subject: [PATCH 5/5] Update servers_v7.json (#9814) * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 9ed1c73c76..faf440da65 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -289,12 +289,12 @@ "name": "MineCore", "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, - { - "name": "Neither", - "address": ["178.20.45.59"] - }, { "name": "Mindus•VN", "address": ["alpha.ateex.cloud:19172"] + }, + { + "name": "Impact", + "address": ["impactmindustry.ddns.net"] } ]