mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-10 15:57:37 +07:00
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
This commit is contained in:
@ -616,6 +616,7 @@ public class DesktopInput extends InputHandler{
|
|||||||
super.updateState();
|
super.updateState();
|
||||||
|
|
||||||
if(state.isMenu()){
|
if(state.isMenu()){
|
||||||
|
lastSchematic = null;
|
||||||
droppingItem = false;
|
droppingItem = false;
|
||||||
mode = none;
|
mode = none;
|
||||||
block = null;
|
block = null;
|
||||||
|
@ -105,7 +105,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Mindustry Español",
|
"name": "Mindustry Español",
|
||||||
"address": ["n2.mindustry.me:4019", "mindustry.me:2034", "mindustry.me:2035"]
|
"address": ["panel.mindustry.me:2011", "mindustry.me:2034", "mindustry.me:2035"]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "CreateDustry",
|
"name": "CreateDustry",
|
||||||
|
@ -23,10 +23,6 @@
|
|||||||
"name": "DarkDustry",
|
"name": "DarkDustry",
|
||||||
"address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"]
|
"address": ["darkdustry.ml", "darkdustry.ml:6000", "darkdustry.ml:7000", "darkdustry.ml:8000", "darkdustry.ml:9000"]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "SkaarjDustry",
|
|
||||||
"address": ["skaarjproject.duckdns.org"]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Chaotic Neutral",
|
"name": "Chaotic Neutral",
|
||||||
"address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"]
|
"address": ["c-n.ddns.net:5555", "c-n.ddns.net:6666"]
|
||||||
|
Reference in New Issue
Block a user