mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-10 02:37:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,655 Commits 4 Branches 160 Tags 2.3 GiB
01e3912827
Commit Graph

5655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
01e3912827 Implemented conservative generators / Closes #804 2019-12-12 16:28:02 -05:00
Anuken
1ae20553ff Merge remote-tracking branch 'origin/master' 2019-12-12 16:07:40 -05:00
Anuken
c68eaade94
Merge pull request #1204 from Prosta4okua/master 
Ukrainian translation.
 2019-12-12 16:07:29 -05:00
Anuken
1461b5b357
Merge pull request #1205 from Prosta4okua/patch-2 
True Ukrainian translation
 2019-12-12 16:07:05 -05:00
Anuken
f0dd3b3a39
Merge pull request #1109 from ballgamer56/patch-1 
Thai translation
 2019-12-12 15:54:50 -05:00
Anuken
61d724ee2b Added Thai font 2019-12-12 15:54:25 -05:00
Prosta4okua
d60c2c5b63
Merge branch 'master' into patch-2 2019-12-12 22:40:30 +02:00
Prosta4okua
7e696cadaf
Update bundle_uk_UA.properties 2019-12-12 22:36:54 +02:00
Anuken
0f23bf9d08
Merge pull request #1156 from martin-mfg/master 
add and fix some German translations
 2019-12-12 15:34:44 -05:00
Anuken
202d79817a
Merge pull request #1149 from itskatt/french-translation 
Update the French Translation
 2019-12-12 15:34:06 -05:00
Anuken
a29ce3b0b9
Merge pull request #1202 from AmateurPotion/patch-23 
Update bundle_ko.properties
 2019-12-12 09:30:18 -05:00
AmateurPotion
fed4842222
Update bundle_ko.properties 2019-12-12 21:48:38 +09:00
Anuken
fbed11e927 Fixed #1198 2019-12-11 15:13:45 -05:00
Anuken
45ce4013d0 Merge remote-tracking branch 'origin/master' 2019-12-11 14:26:51 -05:00
Anuken
6f3d585118
Merge pull request #1183 from GioIacca9/patch-2 
Update bundle_it.properties
 2019-12-11 14:24:37 -05:00
Anuken
962ce7bfa6
Merge pull request #1187 from AmateurPotion/patch-22 
Update bundle_ko.properties
 2019-12-11 14:24:24 -05:00
Anuken
b6ee157adb
Update bundle_zh_TW.properties (#1190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-11 14:24:15 -05:00
TsjipTsjip
a45a632726 Update bundle_nl_BE.properties (#1194) 2019-12-11 14:24:07 -05:00
Anuken
675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Atan599
f6b9830f82 Update bundle_cs.properties (#1192) 2019-12-11 10:51:34 -05:00
TsjipTsjip
324f6351ea "artlleryIncendiary" -> "artilleryIncendiary" (#1196) 
* Gracious error with missing link description keys.

* Fix typo. "artlleryIncendiary" -> "artilleryIncendiary"

* Revert "Gracious error with missing link description keys."

This reverts commit ff5a470560.
 2019-12-11 10:17:28 -05:00
Anuken
aeb6e6498e Minor server tweaks 2019-12-10 17:00:49 -05:00
Anuken
f4ee67c08b Fixed gradle complaining about absolutely nothing 2019-12-10 10:45:07 -05:00
Ali-C-Ila
a2382965f6
Update bundle_zh_TW.properties 2019-12-10 20:17:55 +08:00
Ali-C-Ila
09dbee1401
Update bundle_zh_TW.properties 2019-12-10 20:09:21 +08:00
Anuken
b74696b312 Fixed effect loading 2019-12-09 22:20:53 -05:00
Anuken
da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
AmateurPotion
83a3195e34
Update bundle_ko.properties 2019-12-10 10:26:40 +09:00
AmateurPotion
8148f2a0f7
Update bundle_ko.properties 2019-12-10 10:25:42 +09:00
Anuken
2a03ef0c43 More cleanup 2019-12-09 16:59:43 -05:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken
177cea5c5d Added block size error 2019-12-09 11:48:59 -05:00
Anuken
74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken
9e07b95223 Functional tweaks 2019-12-08 22:50:54 -05:00
Anuken
2554433f8d Fixed #1184 2019-12-08 21:29:03 -05:00
Anuken
e06d61dcc9 FX cleanup 2019-12-08 18:38:56 -05:00
Anuken
1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken
a7d37b7e6c Fixed tests 2019-12-08 15:59:48 -05:00
Anuken
9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken
803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken
6588fc6581 Removed pointless base object 2019-12-08 13:14:47 -05:00
Anuken
9f4d44f0f3 Cleanup / Added server support for scripting 2019-12-08 11:00:59 -05:00
Anuken
07fb5aa88e Bugfixes 2019-12-08 10:27:06 -05:00
Anuken
b3e1436074 Fixed #1176 2019-12-08 10:09:29 -05:00
GioIacca9
98a083abdd
Update bundle_it.properties 2019-12-08 15:49:03 +01:00
Vanguard
86df70a839
1 new line 
load.scripts
 2019-12-08 15:34:43 +03:00
Anuken
fd202421b1 Changed console keybind to prevent confusion 2019-12-08 00:25:13 -05:00
Anuken
268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Anuken
477ebc91bf Fixed reloading 2019-12-07 21:53:50 -05:00
Anuken
fd6abaff62 More class support 2019-12-07 21:46:35 -05:00