mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-13 17:27:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source
This commit is contained in:
Anuken
2021-11-15 08:24:55 -05:00
parent b99e18478f d23813f328
commit 7103de8454
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/input/DesktopInput.java
View File

@ -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;

2
servers_v6.json
View File

@ -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",

4
servers_v7.json
View File

@ -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"]