Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,401 Commits 4 Branches 180 Tags
b06d51708449964b4f8b5f30397bf2ee482d5312
Commit Graph
6401 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LauweJosterandGitHub f06550fc3c Update bundle_nl.properties (#1501) 
Grammar and sentence improvements. Also added translations
 2020-02-11 15:32:18 -05:00
Ali-C-IlaandGitHub 652c143ff6 Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
RasangusandGitHub 64ade54336 Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
kf-gamesandGitHub e6507a84ef Update Servers.json, Add PvP server MINDUSTRY.RU:7000 (#1533) 
Add PvP server MINDUSTRY.RU:7000
 2020-02-11 15:25:30 -05:00
ArkanicandGitHub 91148a7fde oops wrong branch 2020-02-12 08:04:35 +13:00
ArkanicandGitHub e02f370228 Update README.md 2020-02-12 08:01:49 +13:00
Anuken 5aa1e30006 Bugfix 2020-02-11 13:08:42 -05:00
Anuken ad7c72015c Better admin management 2020-02-11 13:06:52 -05:00
Anuken d99f9740e8 USID fixes 2020-02-11 12:36:28 -05:00
Anuken d1840e7c2a Item selection scrolling 2020-02-11 11:55:38 -05:00
Anuken e173eb55ca Merge remote-tracking branch 'origin/master' 2020-02-11 11:30:25 -05:00
Anuken d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
Petr Gašparík bd6b84dc23 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 17:20:40 +01:00
AmateurPotionandGitHub eaa0b53f30 Update README.md (#1548) 
hey?
 2020-02-11 11:13:26 -05:00
fuzzbuckandGitHub f14df52490 Allow admins to bypass the playerlimit [server] (#1549) 2020-02-11 11:10:50 -05:00
Petr Gašparík 29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01:00
Anuken b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
Anuken 9da2d1ee9a Merge remote-tracking branch 'origin/master' 2020-02-10 20:22:09 -05:00
Anuken 6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
GioIacca9andGitHub 941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Daniel JenningsandGitHub baab36bfc5 Trim schematic string before calling Base64Decoder (#1537) 
This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
 2020-02-08 16:41:33 -05:00
Anuken f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Prosta4okuaandGitHub 0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okuaandGitHub d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken 3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken 9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41andGitHub 9b36125b0c Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Anuken 0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken 30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Anuken 5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
扩散性百万甜面包GitHubPatrick 'Quezler' Mounier
 		7b586ea043 Fix a typo (#1528) 
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-07 08:25:26 -05:00
Petr Gašparík e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okuaandGitHub 619b2ba897 Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Anuken 37a9311202 Merge remote-tracking branch 'origin/master' 2020-02-06 20:25:17 -05:00
Anuken e9f37ea68e Removed entity processor files 2020-02-06 20:25:10 -05:00
Prosta4okuaandGitHub 59431b223b Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
MEEP of FaithandGitHub da5755b7c1 For consistancy (#1517) 
Swap "liquids" with "liquid." Also proposing because the category for liquid blocks is "liquid" and not "liquids" when modding.
 2020-02-06 14:46:33 -05:00
Anuken 70c06b58ef Conveyor cleanup 2020-02-06 11:38:36 -05:00
VanguardandGitHub 9b30b452a1 3 changed lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:39:32 +03:00
VanguardandGitHub c254a702fc 3 new lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:34:19 +03:00
Anuken 4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
martin-mfgGitHubAnukenSilvério Santos
 		d59b23b835 bundle_de.properties: merge PRs + further improvements (#1482) 
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
 2020-02-05 18:37:21 -05:00
Patrick 'Quezler' MounierandGitHub e06d8eabec [formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00
Arkanic ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00:00
Patrick 'Quezler' MounierandGitHub 8bb533f646 3rd times the charm (#1509) 2020-02-05 13:06:16 -05:00
Petr Gašparík 39b35dd9cb Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-05 08:34:59 +01:00