mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 12:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2022-05-11 20:18:29 -04:00
commit de909b2ad3
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/contributors
View File

@ -41,6 +41,7 @@ Jan Polák
JrTRinny JrTRinny
JustYanns JustYanns
BasedUser BasedUser
RexHm
BLucky-gh BLucky-gh
DinoWattz DinoWattz
Jae Jae
@ -136,4 +137,4 @@ Evolveye
Jerzy Paciorkiewicz Jerzy Paciorkiewicz
YozoZChomutova YozoZChomutova
Qendolin Qendolin
Goobrr Goobrr

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

@ -287,7 +287,6 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
throw new ValidateException(player, "Player cannot transfer an item."); throw new ValidateException(player, "Player cannot transfer an item.");
} }
//deposit for every controlling unit
var unit = player.unit(); var unit = player.unit();
Item item = unit.item(); Item item = unit.item();
int accepted = build.acceptStack(item, unit.stack.amount, unit); int accepted = build.acceptStack(item, unit.stack.amount, unit);

9
servers_be.json
View File

@ -2,9 +2,18 @@
{ {
"address": "be.mindustry.nydus.app:6567" "address": "be.mindustry.nydus.app:6567"
}, },
{
"address": "130.61.226.9"
},
{
"address": "130.61.226.9:7777"
},
{ {
"address": "0.baseduser.eu.org:7777" "address": "0.baseduser.eu.org:7777"
}, },
{
"address": "0.baseduser.eu.org:42001"
},
{ {
"address": "v7.mindurka.tk:9999" "address": "v7.mindurka.tk:9999"
}, },

2
servers_v7.json
View File

@ -1,7 +1,7 @@
[ [
{ {
"name": "distributorium", "name": "distributorium",
"address": ["130.61.226.9", "0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"] "address": ["0.baseduser.eu.org:6966", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6000"]
}, },
{ {
"name": "C.A.M.S.", "name": "C.A.M.S.",