From b8842a34ae101f0968625f933d1826396df99db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E7=91=9E=E6=9A=84?= Date: Tue, 18 Jan 2022 10:58:26 +0800 Subject: [PATCH 01/20] Update bundle_zh_TW.properties (#6470) --- core/assets/bundles/bundle_zh_TW.properties | 44 ++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 5269a0dc6b..7c3712c53b 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -288,7 +288,7 @@ save.corrupted = 此存檔無效或已損毀！ empty = 〈空白〉 on = 開啟 off = 關閉 -save.search = Search saved games... +save.search = 搜尋儲存的遊戲…… save.autosave = 自動存檔：{0} save.map = 地圖：{0} save.wave = 波次：{0} @@ -380,13 +380,13 @@ editor.ingame = 在遊戲中編輯 editor.publish.workshop = 在工作坊上發佈 editor.newmap = 新地圖 editor.center = 中心 -editor.search = 尋找地圖... +editor.search = 尋找地圖… editor.filters = 篩選地圖 -editor.filters.mode = Gamemodes: -editor.filters.type = Map Type: -editor.filters.search = Search In: -editor.filters.author = Author -editor.filters.description = Description +editor.filters.mode = 遊戲模式： +editor.filters.type = 地圖種類： +editor.filters.search = 搜尋的資料夾： +editor.filters.author = 作者 +editor.filters.description = 描述 workshop = 工作坊 waves.title = 波次 waves.remove = 移除 @@ -420,7 +420,7 @@ wavemode.health = 生命值 editor.default = [lightgray]（預設） details = 詳細資訊…… edit = 編輯…… -variables = Vars +variables = 變數 editor.name = 名稱： editor.spawn = 重生單位 editor.removeunit = 移除單位 @@ -1301,7 +1301,7 @@ block.plated-conduit.name = 裝甲管線 block.phase-conduit.name = 相織管線 block.liquid-router.name = 液體分配器 block.liquid-tank.name = 液體儲存槽 -block.liquid-container.name = Liquid Container +block.liquid-container.name = 液體容器 block.liquid-junction.name = 液體樞紐 block.bridge-conduit.name = 管線橋 block.rotary-pump.name = 迴旋泵 @@ -1348,16 +1348,16 @@ block.disassembler.name = 還原機 block.silicon-crucible.name = 矽爐 block.overdrive-dome.name = 高速拱頂 block.interplanetary-accelerator.name = 星際加速站 -block.constructor.name = Constructor -block.constructor.description = Fabricates structures up to 2x2 tiles in size. -block.large-constructor.name = Large Constructor -block.large-constructor.description = Fabricates structures up to 4x4 tiles in size. -block.deconstructor.name = Deconstructor -block.deconstructor.description = Deconstructs structures and units. Returns 100% of build cost. -block.payload-loader.name = Payload Loader -block.payload-loader.description = Load liquids and items into blocks. -block.payload-unloader.name = Payload Unloader -block.payload-unloader.description = Unloads liquids and items from blocks. +block.constructor.name = 建造器 +block.constructor.description = 建造達 2x2 的方塊。 +block.large-constructor.name = 大型建造器 +block.large-constructor.description = 建造達 4x4 的方塊。 +block.deconstructor.name = 拆解器 +block.deconstructor.description = 拆解方塊和單位，返還所有建造花費。 +block.payload-loader.name = 載物裝入器 +block.payload-loader.description = 將物品或是液體裝入方塊。 +block.payload-unloader.name = 載物取出器 +block.payload-unloader.description = 將物品或是液體從方塊取出。 block.switch.name = 按鈕 block.micro-processor.name = 微處理器 @@ -1468,7 +1468,7 @@ block.incinerator.description = 銷毀所有接收的物品或液體。 block.power-void.description = 銷毀所有輸入的能量。僅限沙盒。 block.power-source.description = 無限輸出能量。僅限沙盒。 block.item-source.description = 無限輸出物品。僅限沙盒。 -block.item-void.description = 不使用能量銷毀任何進入它的物品。僅限沙盒。 +block.item-void.description = 銷毀所有進入的物品。僅限沙盒。 block.liquid-source.description = 無限輸出液體。僅限沙盒。 block.liquid-void.description = 銷毀所有輸入的液體。僅限沙盒。 block.payload-source.description = 無限輸出原料。僅限沙盒。 @@ -1513,7 +1513,7 @@ block.conduit.description = 基本液體運輸方塊。將液體往前輸送。 block.pulse-conduit.description = 高級的液體運輸方塊。比標準管線更快地輸送並儲存更多液體。 block.plated-conduit.description = 用和脈衝管線相同的速率運送液體，但有更強的裝甲。除了其他管線以外，不會接受來自側面的其他液體\n比較不會漏液。 block.liquid-router.description = 接受來自一個方向的液體並將它們平均輸出到最多3個其他方向。可以儲存一定量的液體。用於將液體從一個來源分成多個目標。 -block.liquid-container.description = Stores a sizeable amount of liquid. Outputs to all sides, similarly to a liquid router. +block.liquid-container.description = 儲存可觀的液體。由四邊輸出，與液體分配器雷同。 block.liquid-tank.description = 儲存大量液體。當液體需求非恆定時，使用它來創建緩衝或作為冷卻重要方塊的保障。 block.liquid-junction.description = 作為兩個交叉管線的橋樑。適用於兩條不同管線將不同液體運送到不同位置的情況。 block.bridge-conduit.description = 高級的液體運輸方塊。允許跨過最多3個任何地形或建築物的方塊運輸液體。 @@ -1778,7 +1778,7 @@ lenum.itemdrop = 放下物品 lenum.itemtake = 從建築拿取物品 lenum.paydrop = 放下拾取的負載 lenum.paytake = 拾取船身下方的單位/建築 -lenum.payenter = Enter/land on the payload block the unit is on. +lenum.payenter = 進入/降落到載重方塊 lenum.flag = 單位編號(可異) lenum.mine = 挖指定位置的礦物 lenum.build = 建造一個建築 From 3311e409067a6d318c651dfe088102b412824d9d Mon Sep 17 00:00:00 2001 From: VizardAlpha <43859764+VizardAlpha@users.noreply.github.com> Date: Tue, 18 Jan 2022 05:18:41 +0100 Subject: [PATCH 02/20] Update bundle_fr.properties (#6373) * Update bundle_fr.properties * Removes -> Destroys.. --- core/assets/bundles/bundle_fr.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 4c879bdc23..2a6ce0a0d9 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -589,7 +589,7 @@ sectors.unexplored = [lightgray]Inexploré sectors.resources = Ressources : sectors.production = Production : sectors.export = Exporter : -sectors.import = Import: +sectors.import = Importer : sectors.time = Temps de jeu : sectors.threat = Menace : sectors.wave = Vague : @@ -823,7 +823,7 @@ bullet.damage = [stat]{0}[lightgray] dégâts bullet.splashdamage = [stat]{0}[lightgray] dégâts de zone ~[stat] {1}[lightgray] blocs bullet.incendiary = [stat]incendiaire bullet.homing = [stat]autoguidé -bullet.frags = [stat]{0}[lightgray]x frag bullets: +bullet.frags = [stat]{0}[lightgray]x Balle à fragmentation : bullet.lightning = [stat]{0}[lightgray]x foudre ~ [stat]{1}[lightgray] dégâts bullet.buildingdamage = [stat]{0}%[lightgray] des dégâts aux bâtiments bullet.knockback = [stat]{0}[lightgray] recul @@ -1036,7 +1036,7 @@ rules.wavetimer = Compte à rebours des vagues rules.waves = Vagues rules.attack = Mode « Attaque » rules.buildai = Constructions de l'IA -rules.aitier = AI Tier +rules.aitier = IA Tier rules.cleanupdeadteams = Détruire les structures des équipes vaincues (JcJ) rules.corecapture = Capture du Noyau lors de sa Destruction rules.polygoncoreprotection = Protection du noyau polygonal @@ -1056,15 +1056,15 @@ rules.deconstructrefundmultiplier = Multiplicateur du remboursement lors de la d rules.waitForWaveToEnd = Les Vagues attendent la mort des ennemis rules.dropzoneradius = Rayon d'Apparition des ennemis :[lightgray] (tuiles) rules.unitammo = Les Unités nécessitent des munitions -rules.enemyteam = Enemy Team -rules.playerteam = Player Team +rules.enemyteam = Équipe ennemie +rules.playerteam = Équipe du joueur rules.title.waves = Vagues rules.title.resourcesbuilding = Resources & Construction rules.title.enemy = Ennemis rules.title.unit = Unités rules.title.experimental = Expérimental rules.title.environment = Environnement -rules.title.teams = Teams +rules.title.teams = Équipes rules.lighting = Éclairage rules.enemyLights = Éclairage ennemi rules.fire = Feu @@ -1479,9 +1479,9 @@ block.incinerator.description = Incinère ou vaporise n'importe quel objet ou li block.power-void.description = Absorbe toute l'énergie qui va à l'intérieur. Bac à sable uniquement. block.power-source.description = Produit de l'énergie à l'infini. Bac à sable uniquement. block.item-source.description = Produit des objets à l'infini. Bac à sable uniquement. -block.item-void.description = Désintègre n'importe quel objet qui va à l'intérieur. Bac à sable uniquement. +block.item-void.description = Détruit les objets introduits. Bac à sable uniquement. block.liquid-source.description = Source de liquide infinie. Bac à sable uniquement. -block.liquid-void.description = Détruit n'importe quel liquide. Bac à sable uniquement. +block.liquid-void.description = Détruit les liquides introduits. Bac à sable uniquement. block.payload-source.description = Produit des charges utiles à l'infini. Bac à sable uniquement. block.payload-void.description = Détruit toutes les charges utiles. Bac à sable uniquement. block.copper-wall.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles lors des premières vagues. From 4a05c9547a0f3f41f2624fd38cda1156c8497617 Mon Sep 17 00:00:00 2001 From: Weathercold Date: Tue, 18 Jan 2022 22:26:24 -0500 Subject: [PATCH 03/20] TextSetting (#6503) * tile tile * > Called right after load() * TextSetting * nvm I change the doc instead * Fixes --- core/src/mindustry/core/ContentLoader.java | 10 +-- core/src/mindustry/ctype/Content.java | 2 +- .../ui/dialogs/SettingsMenuDialog.java | 85 +++++++++++++++++++ core/src/mindustry/world/Block.java | 2 +- 4 files changed, 92 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 7d738135cd..8dd4357817 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -48,7 +48,7 @@ public class ContentLoader{ clear(); } - /** Clears all initialized content.*/ + /** Clears all initialized content. */ public void clear(){ contentNameMap = new ObjectMap[ContentType.all.length]; contentMap = new Seq[ContentType.all.length]; @@ -75,7 +75,7 @@ public class ContentLoader{ } } - /** Logs content statistics.*/ + /** Logs content statistics. */ public void logContent(){ //check up ID mapping, make sure it's linear (debug only) for(Seq arr : contentMap){ @@ -95,14 +95,14 @@ public class ContentLoader{ Log.debug("-------------------"); } - /** Calls Content#init() on everything. Use only after all modules have been created.*/ + /** Calls Content#init() on everything. Use only after all modules have been created. */ public void init(){ initialize(Content::init); if(constants != null) constants.init(); Events.fire(new ContentInitEvent()); } - /** Calls Content#load() on everything. Use only after all modules have been created on the client.*/ + /** Calls Content#loadIcon() and Content#load() on everything. Use only after all modules have been created on the client. */ public void load(){ initialize(Content::loadIcon); initialize(Content::load); @@ -323,4 +323,4 @@ public class ContentLoader{ public Planet planet(String name){ return getByName(ContentType.planet, name); } -} \ No newline at end of file +} diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java index fb0679bf9b..bea224683e 100644 --- a/core/src/mindustry/ctype/Content.java +++ b/core/src/mindustry/ctype/Content.java @@ -31,7 +31,7 @@ public abstract class Content implements Comparable{ */ public void load(){} - /** Called right after load(). */ + /** Called right before load(). */ public void loadIcon(){} /** @return whether an error occurred during mod loading. */ diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index ea864a0064..afd051dd97 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -589,6 +589,30 @@ public class SettingsMenuDialog extends BaseDialog{ rebuild(); } + public void textPref(String name, String def){ + list.add(new TextSetting(name, def, null)); + settings.defaults(name, def); + rebuild(); + } + + public void textPref(String name, String def, Cons changed){ + list.add(new TextSetting(name, def, changed)); + settings.defaults(name, def); + rebuild(); + } + + public void areaTextPref(String name, String def){ + list.add(new AreaTextSetting(name, def, null)); + settings.defaults(name, def); + rebuild(); + } + + public void areaTextPref(String name, String def, Cons changed){ + list.add(new AreaTextSetting(name, def, changed)); + settings.defaults(name, def); + rebuild(); + } + public void rebuild(){ clearChildren(); @@ -704,6 +728,67 @@ public class SettingsMenuDialog extends BaseDialog{ table.row(); } } + + public static class TextSetting extends Setting{ + String def; + Cons changed; + public TextSetting(String name, String def, Cons changed){ + super(name); + this.def = def; + this.changed = changed; + } + + @Override + public void add(SettingsTable table){ + TextField field = new TextField(); + + field.update(() -> field.setText(settings.getString(name))); + + field.changed(() -> { + settings.put(name, field.getText()); + if(changed != null){ + changed.get(field.getText()); + } + }); + + Table prefTable = table.table().left().padTop(3f).get(); + prefTable.add(field); + prefTable.label(() -> title); + addDesc(prefTable); + table.row(); + } + } + + public static class AreaTextSetting extends TextSetting{ + String def; + Cons changed; + + public AreaTextSetting(String name, String def, Cons changed){ + super(name, def, changed); + } + + @Override + public void add(SettingsTable table){ + TextArea area = new TextArea(""); + area.setPrefRows(5); + + area.update(() -> { + area.setText(settings.getString(name)); + area.setWidth(table.getWidth()); + }); + + area.changed(() -> { + settings.put(name, area.getText()); + if(changed != null){ + changed.get(area.getText()); + } + }); + + addDesc(table.label(() -> title).left().padTop(3f).get()); + table.row().add(area).left(); + table.row(); + } + } } } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 666f80305a..2a3a9ea12c 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -395,7 +395,7 @@ public class Block extends UnlockableContent{ return hasItems; } - /** Returns whether or not this block can be place on the specified */ + /** @return whether or not this block can be placed on the specified tile. */ public boolean canPlaceOn(Tile tile, Team team, int rotation){ return canPlaceOn(tile, team); } From a3ccdce0ebf3e3a8f891191131b3ba2db074e107 Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Wed, 19 Jan 2022 18:42:31 +0300 Subject: [PATCH 04/20] Infection dns change (#6506) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 75db78dd16..0ceb7563d4 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -1,7 +1,7 @@ [ { "name": "Infection", - "address": ["plague-continued.ml:5555", "plague-continued.ml:5004"] + "address": ["n3.mindustry.me:5555", "n3.mindustry.me:5004"] }, { "name": "RCM", From 287dc35640b32726cc3d4c97109652554bf45fd2 Mon Sep 17 00:00:00 2001 From: Iloveidea <72866054+Iloveidea@users.noreply.github.com> Date: Fri, 21 Jan 2022 22:46:03 +0800 Subject: [PATCH 05/20] Update LiquidConverter.java (#6507) --- core/src/mindustry/world/blocks/production/LiquidConverter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java index c01dbfbc36..ed6d57915d 100644 --- a/core/src/mindustry/world/blocks/production/LiquidConverter.java +++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java @@ -24,7 +24,6 @@ public class LiquidConverter extends GenericCrafter{ ConsumeLiquid cl = consumes.get(ConsumeType.liquid); cl.update(false); - outputLiquid.amount = cl.amount; super.init(); } From df994a2ebd2b920b501da78ee82240c28e70754b 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: Fri, 21 Jan 2022 22:50:32 +0300 Subject: [PATCH 06/20] Remove my second server and a V6 server (#6510) * Remove my second server and 2 cursed servers Remove * Add Community server back --- servers_v7.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 70b071417b..d0c785ba07 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["n3.mindustry.me:5002", "n3.mindustry.me:5003", "n3.mindustry.me:5004","n3.mindustry.me:5005", "n3.mindustry.me:5006", "n3.mindustry.me:5007", "n3.mindustry.me", "n3.mindustry.me:4006"] + "address": ["n3.mindustry.me:5002", "n3.mindustry.me:5003", "n3.mindustry.me:5005", "n3.mindustry.me:5006", "n3.mindustry.me:5007", "n3.mindustry.me", "n3.mindustry.me:4006"] }, { "name": "MeowLand", @@ -51,10 +51,6 @@ "name": "SubZero", "address": ["minty-server.ddns.net"] }, - { - "name": "Shiza Minigames", - "address": ["shizashizashiza.ml"] - }, { "name": "Phoenix Network", "address": ["172.104.253.198"] From c26671fd4b9d86a2c697d2c3462056c70ea73ce9 Mon Sep 17 00:00:00 2001 From: OSP <76648940+osp54@users.noreply.github.com> Date: Fri, 21 Jan 2022 23:28:11 +0200 Subject: [PATCH 07/20] [XCore] Attack ip update (#6512) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index d0c785ba07..ef6d610018 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "XCore", - "address": ["node.procord.vip:2707", "eu-fsn-01.vapur.host:24603"] + "address": ["node.procord.vip:2707", "de14.halexnodes.net:40036"] }, { "name": "Obvilion Network", From 30070ce7593a4434c95317b57aef0ba6fe579cc8 Mon Sep 17 00:00:00 2001 From: CPXMC <62936489+CPXMC@users.noreply.github.com> Date: Sat, 22 Jan 2022 09:05:48 +0800 Subject: [PATCH 08/20] Change my main name in Contributors (#6513) CPXMC to PCX-LK --- core/assets/contributors | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/contributors b/core/assets/contributors index cf8d54cf74..a46d54ee98 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -115,7 +115,7 @@ younggam simba-fs RedRadiation Marko Zajc -CPX MC +PCX-LK (CPX MC) Phinner BTA_Susideur nilq From e2658ba4973a2ff75c5240c29018ddcd0906406f Mon Sep 17 00:00:00 2001 From: Nile <80833369+nilederg@users.noreply.github.com> Date: Fri, 21 Jan 2022 17:07:37 -0800 Subject: [PATCH 09/20] Restoring the natural order of things (#6514) Renamed Infection to Yeet Hosting, as Infection has dissolved due to recessive's return, and Yeet Hosting was our hosts when it was up. --- servers_v6.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 0ceb7563d4..9d862add43 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -1,16 +1,16 @@ [ { - "name": "Infection", - "address": ["n3.mindustry.me:5555", "n3.mindustry.me:5004"] + "name": "{AA}", + "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] + }, + { + "name": "Yeet Hosting", + "address": ["n3.mindustry.me:5004"] }, { "name": "RCM", "address": ["185.104.248.61", "easyplay.su"] }, - { - "name": "{AA}", - "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] - }, { "name": "Atanner", "address": ["atannergaming.com:13000"] From 716702623d494ef83a27acdc72d030b436976551 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Sun, 23 Jan 2022 16:34:28 -0800 Subject: [PATCH 10/20] onConfigureClosed (#6523) * onConfigureClosed * Run the closing of the previous block's config on the opening of another --- core/src/mindustry/entities/comp/BuildingComp.java | 5 +++++ core/src/mindustry/ui/fragments/BlockConfigFragment.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 262c53d414..5847ef8966 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1249,6 +1249,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return self() != other; } + /** + * Called when this block's config menu is closed + */ + public void onConfigureClosed(){} + /** Returns whether this config menu should show when the specified player taps it. */ public boolean shouldShowConfigure(Player player){ return true; diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java index 1523508aa4..10cd46f6ef 100644 --- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java @@ -49,6 +49,7 @@ public class BlockConfigFragment extends Fragment{ } public void showConfig(Building tile){ + if(configTile != null) configTile.onConfigureClosed(); if(tile.configTapped()){ configTile = tile; @@ -82,6 +83,7 @@ public class BlockConfigFragment extends Fragment{ } public void hideConfig(){ + if(configTile != null) configTile.onConfigureClosed(); configTile = null; table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interp.pow3Out), Actions.visible(false)); } From 5596354454bc9979b866676f8feac6667d097db1 Mon Sep 17 00:00:00 2001 From: SachaTending <65766775+SachaTending@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:03:38 +0300 Subject: [PATCH 11/20] Add tendhost to servers (#6517) * Add tendhost to servers New server * Update servers_v6.json --- servers_v6.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v6.json b/servers_v6.json index 9d862add43..d7ad26c50a 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -10,6 +10,10 @@ { "name": "RCM", "address": ["185.104.248.61", "easyplay.su"] + }, + { + "name": "Tendhost", + "address": ["tendhost.ddns.net"] }, { "name": "Atanner", From ed598e203c1b0e7df8b9cdcbe9b6eaa15c5d720c Mon Sep 17 00:00:00 2001 From: Phinner <62483793+Phinner@users.noreply.github.com> Date: Mon, 24 Jan 2022 17:05:53 +0100 Subject: [PATCH 12/20] Add Xpdustry BE server (#6526) A secret place for testing unstable plugins :^) --- servers_be.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers_be.json b/servers_be.json index 6097ace2ae..9245f93cec 100644 --- a/servers_be.json +++ b/servers_be.json @@ -10,5 +10,8 @@ }, { "address": "c-n.ddns.net:6567" + }, + { + "address": "xpdustry.fr:8000" } ] From d81efe4f71f0da7c6ad79265bf5d44daaf609f14 Mon Sep 17 00:00:00 2001 From: Sh1p*nfire <73347888+Sh1penfire@users.noreply.github.com> Date: Wed, 26 Jan 2022 02:05:52 +1100 Subject: [PATCH 13/20] fix Cyerce's frag keeping owner velocity (#6527) --- core/src/mindustry/content/UnitTypes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index a256483cea..98939b1056 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2040,6 +2040,7 @@ public class UnitTypes implements ContentList{ weaveMag = 4; weaveScale = 4; lifetime = 60f; + keepVelocity = false; shootEffect = Fx.shootHeal; smokeEffect = Fx.hitLaser; splashDamage = 13f; From fa06d2c20b4c34decbcaf9d541730ab43672f498 Mon Sep 17 00:00:00 2001 From: buthed010203 Date: Tue, 25 Jan 2022 10:38:38 -0500 Subject: [PATCH 14/20] Fix broken powernode Point2[] config (#6531) This was broken. I fixed it. --- core/src/mindustry/world/blocks/power/PowerNode.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 4c59a84174..2e89a47fca 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -84,8 +84,6 @@ public class PowerNode extends PowerBlock{ }); config(Point2[].class, (tile, value) -> { - tile.power.links.clear(); - IntSeq old = new IntSeq(tile.power.links); //clear old From 0b9483cffc137bb08f7e5c70c09ffa69b29b4a1e Mon Sep 17 00:00:00 2001 From: Leonid Skorospelov Date: Thu, 27 Jan 2022 19:57:43 +0000 Subject: [PATCH 15/20] Preserve conveyors end rotation on placement (#6496) * Preserve conveyors end rotation on placement * Formatting --- core/src/mindustry/input/InputHandler.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 0bcc17727e..c283e516f3 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -1269,19 +1269,24 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } int endRotation = -1; + var start = world.build(startX, startY); + var end = world.build(endX, endY); if(diagonal){ - var start = world.build(startX, startY); - var end = world.build(endX, endY); if(block != null && start instanceof ChainedBuilding && end instanceof ChainedBuilding && block.canReplace(end.block) && block.canReplace(start.block)){ points = Placement.upgradeLine(startX, startY, endX, endY); - endRotation = end.rotation; }else{ points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY); } }else{ points = Placement.normalizeLine(startX, startY, endX, endY); } + if(points.size > 1 && end instanceof ChainedBuilding){ + Point2 secondToLast = points.get(points.size - 2); + if (!(world.build(secondToLast.x, secondToLast.y) instanceof ChainedBuilding)){ + endRotation = end.rotation; + } + } if(block != null){ block.changePlacementPath(points, rotation); From 29311806a96f8d1b04165bbfd73dcecf198d1980 Mon Sep 17 00:00:00 2001 From: smol <75618732+SMOLKEYS@users.noreply.github.com> Date: Sun, 30 Jan 2022 00:34:34 +0800 Subject: [PATCH 16/20] PlayerConnectionConfirmed (#6539) * PlayerConnectionConfirmed * AdminRequestEvent --- core/assets/scripts/global.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index bcc2247d9f..da5b114267 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -199,3 +199,5 @@ const ResizeEvent = Packages.mindustry.game.EventType.ResizeEvent const LoseEvent = Packages.mindustry.game.EventType.LoseEvent const WinEvent = Packages.mindustry.game.EventType.WinEvent const Trigger = Packages.mindustry.game.EventType.Trigger +const PlayerConnectionConfirmed = Packages.mindustry.game.EventType.PlayerConnectionConfirmed +const AdminRequestEvent = Packages.mindustry.game.EventType.AdminRequestEvent From b3a91f50c19e537b1282ec8a15e11d1fc4f12fd8 Mon Sep 17 00:00:00 2001 From: Rex <77251557+Rex-Hm@users.noreply.github.com> Date: Mon, 31 Jan 2022 16:42:25 -0300 Subject: [PATCH 17/20] Update servers_v6.json (#6543) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index d7ad26c50a..0f16e5de28 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -105,7 +105,7 @@ }, { "name": "Mindustry Español", - "address": ["yeeth.mindustry.me:6578", "yeeth.mindustry.me:6573", "yeeth.mindustry.me:6577", "yeeth.mindustry.me:6576"] + "address": ["n4.mindustry.me:6578", "n4.mindustry.me:6573", "n4.mindustry.me:6577", "n4.mindustry.me:6576"] }, { "name": "CreateDustry", From 85d36800945f0652bea2d788b2b4dba402bae904 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 31 Jan 2022 14:46:18 -0500 Subject: [PATCH 18/20] I have not checked my email in a month and at this point I'm not sure if I should. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea0a1f6872..99086e0da2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ Do not submit something without at least running the game to see if it compiles. If you are submitting a new block, make sure it has a name and description, and that it works correctly in-game. If you are changing existing block mechanics, test them out first. ### Do not make large changes before discussing them first. -If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*). +If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) - either via PM or by posting in the `#pulls` channel. For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it. ### Do not make formatting PRs. From e5d16a73c5e09a38eab4ab66771736457f19e236 Mon Sep 17 00:00:00 2001 From: Recessive <61154659+Recessive@users.noreply.github.com> Date: Wed, 2 Feb 2022 01:35:59 +1100 Subject: [PATCH 19/20] Changed AA servers to new IP (#6546) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 0f16e5de28..69da889aa7 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -1,7 +1,7 @@ [ { "name": "{AA}", - "address": ["aamindustry.play.ai", "aamindustry.play.ai:6571", "aamindustry.play.ai:6572", "aamindustry.play.ai:6573", "aamindustry.play.ai:6574"] + "address": ["recessive.net"] }, { "name": "Yeet Hosting", From dc02678a6df637b99ea60bc056d143c16c241671 Mon Sep 17 00:00:00 2001 From: Sam Bloom Date: Tue, 1 Feb 2022 17:35:58 -0500 Subject: [PATCH 20/20] Omega IP Change (#6548) * almost done * Update servers_v6.json * last ip change (for a long time) --- servers_v6.json | 2 +- servers_v7.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 69da889aa7..81cc6c2e7e 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -61,7 +61,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me:6568","yeeth.mindustry.me:5002"] + "address": ["omegav.mindustry.me:6572"] }, { "name": "Obvilion Network", diff --git a/servers_v7.json b/servers_v7.json index ef6d610018..c485a7278b 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["n3.mindustry.me:5002", "n3.mindustry.me:5003", "n3.mindustry.me:5005", "n3.mindustry.me:5006", "n3.mindustry.me:5007", "n3.mindustry.me", "n3.mindustry.me:4006"] + "address": ["omegam.mindustry.me:5002", "omegam.mindustry.me:5003", "omegam.mindustry.me:5005", "omegam.mindustry.me:5006", "omegam.mindustry.me:5007", "omegam.mindustry.me", "omegam.mindustry.me:4006"] }, { "name": "MeowLand",