From 52759faa5d6d993ab0ceda6cadabf5f6c8cdb9ee Mon Sep 17 00:00:00 2001 From: Joan Josep Date: Sun, 25 Sep 2022 13:13:36 +0200 Subject: [PATCH 1/2] Update bundle_ca.properties (#7623) --- core/assets/bundles/bundle_ca.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_ca.properties b/core/assets/bundles/bundle_ca.properties index 021f10c389..45ab5f366b 100644 --- a/core/assets/bundles/bundle_ca.properties +++ b/core/assets/bundles/bundle_ca.properties @@ -176,10 +176,10 @@ filename = Nom del fitxer: unlocked = S’ha desblocat contingut nou! available = Hi ha una recerca disponible nova! unlock.incampaign = < Desbloca en el mode campanya per a veure’n més detalls. > -campaign.select = Select Starting Campaign -campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time. -campaign.erekir = [accent]Recommended for new players.[]\n\nNewer, more polished content. Mostly linear campaign progression.\n\nHigher quality maps and overall experience. -campaign.serpulo = [scarlet]Not recommended for new players.[]\n\nOlder content; the classic experience. More open-ended.\n\nPotentially unbalanced maps and campaign mechanics. Less polished. +campaign.select = Trieu la campanya inicial +campaign.none = [lightgray]Trieu en quin planeta voleu començar.\nEs pot canviar en qualsevol moment. +campaign.erekir = [accent]Recomanat per a jugadors novells.[]\n\nContingut revisat nou. Una campanya de progressió més o menys lineal.\n\nMapes de qualitat més alta i experiència més satisfactòria. +campaign.serpulo = [scarlet]No recomanat per a jugadors novells.[]\n\nContingut antic; l’experiència clàssica. Campanya més oberta.\n\nPotser els mapes i mecàniques de la campanya no estan massa equilibrats. Contingut en general menys polit que el d’Erekir. completed = [accent]Completat techtree = Arbre tecnològic techtree.select = Selecció de l’arbre tecnològic From 04a75d14b1c5507b98fb2c11facb271cb91b9870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D1=80=D0=BA=D0=BD=D0=B5=D1=81=D1=81=233729?= <79508138+Darkness6030@users.noreply.github.com> Date: Sun, 25 Sep 2022 20:26:17 +0300 Subject: [PATCH 2/2] remove enabled() check in getMod() method (#7625) --- core/src/mindustry/mod/Mods.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index ce28e46602..042020f0d8 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -84,7 +84,7 @@ public class Mods implements Loadable{ /** @return the loaded mod found by class, or null if not found. */ public @Nullable LoadedMod getMod(Class type){ - return mods.find(m -> m.enabled() && m.main != null && m.main.getClass() == type); + return mods.find(m -> m.main != null && m.main.getClass() == type); } /** Imports an external mod file. Folders are not supported here. */