Commit Graph

6635 Commits

Author SHA1 Message Date
Anuken
3a7d3f4973 Merge remote-tracking branch 'origin/master' 2020-03-25 11:06:56 -04:00
Anuken
6cc2719ed7 Updated FBO method names 2020-03-25 11:06:52 -04:00
Fernando
70d7f68078 Update bundle_pt_BR.properties 2020-03-24 20:50:52 -03:00
Fernando
6ecee1e947 Update bundle_pt_BR.properties 2020-03-24 20:46:48 -03:00
Dexapnow
d18697a504 Update bundle_pl.properties (#1742)
Based of "missing tags"
2020-03-24 11:18:06 -04:00
Anuken
a1b64900ab 2 2020-03-24 00:33:59 -04:00
Anuken
2b4ce01fac Updated arc 2020-03-24 00:25:36 -04:00
Anuken
52b6e756bc Fixed some issues with scaled ninepatches 2020-03-24 00:22:28 -04:00
Patrick 'Quezler' Mounier
104fd78966 Collapse while 2020-03-23 17:07:11 +01:00
Patrick 'Quezler' Mounier
6b27d19057 Alter comments 2020-03-23 17:05:03 +01:00
Patrick 'Quezler' Mounier
6228b5353f Pack dump into conveyor rotation 2020-03-23 17:01:47 +01:00
Olexandr Nesterenko
75272c0a3e change scrap name 2020-03-23 12:30:39 +02:00
Anuken
c4d5314a1a Color script fixes 2020-03-19 20:15:41 -04:00
Anuken
966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken
f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
TheJaaju
998cc9535e Update bundle_fi.properties
Titles
2020-03-19 22:54:08 +02:00
laohuaji233
da215425e9 Update bundle_zh_CN.properties 2020-03-19 15:53:38 +08:00
TheJaaju
58a4ec1265 Update bundle_fi.properties 2020-03-18 08:42:16 +02:00
Anuken
71f20f928a Update build.gradle 2020-03-17 20:01:44 -04:00
TheJaaju
b874eecd5f Update bundle_fi.properties
+ translations
2020-03-18 01:40:29 +02:00
Ali-C-Ila
0d19068219 Update bundle_zh_TW.properties (#1718)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2020-03-17 12:02:56 -04:00
TheJaaju
b0dddb2a7c Update bundle_fi.properties (#1720)
added translations and fixed a typo
2020-03-17 12:02:47 -04:00
Prosta4okua
9d24a47b01 Update bundle_uk_UA.properties 2020-03-17 13:01:31 +02:00
Prosta4okua
bc0104b0cc Update bundle_uk_UA.properties 2020-03-17 09:31:16 +02:00
Olexandr Nesterenko
567eb1e9dd revert some fix 2020-03-16 16:01:23 +02:00
Olexandr Nesterenko
660e27f002 fix uk 2020-03-16 13:24:18 +02:00
Olexandr Nesterenko
f23177fddc Update uk 2020-03-16 12:12:14 +02:00
Olexandr Nesterenko
9a529fc40b Fix uk translation 2020-03-16 11:54:37 +02:00
Patrick 'Quezler' Mounier
164dd0c405 Revert "Revert "Revert "Revert "Repurpose branch to be played""""
This reverts commit 8caa9ed548.
2020-03-16 09:15:44 +01:00
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
Petr Gašparík
ad6d819b8f Czech translation - fixed typo 2020-03-16 00:06:39 +01:00
Petr Gašparík
0749120df3 Czech - update translations for 104.x 2020-03-16 00:05:20 +01:00
Petr Gašparík
865397983b Czech - ud to date translation 2020-03-15 23:43:52 +01:00
Petr Gašparík
b6f1b7570b Merge branch 'master' of https://github.com/Anuken/Mindustry into v104 2020-03-15 23:30:37 +01:00
Vanguard
11b6ae58d7 1 new line, 1 changed line
New:
rules.deconstructrefundmultiplier

Changed:
stat.deconstructed
2020-03-16 00:34:58 +03:00
Patrick 'Quezler' Mounier
8caa9ed548 Revert "Revert "Revert "Repurpose branch to be played"""
This reverts commit 4b08cfd2b7.
2020-03-15 22:04:10 +01:00
Patrick 'Quezler' Mounier
4f195b72d1 Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
Patrick 'Quezler' Mounier
4b08cfd2b7 Revert "Revert "Repurpose branch to be played""
This reverts commit 9df875354a.
2020-03-15 22:00:45 +01:00
ma44
ec34e27102 map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
laohuaji233
377ac2be90 Update bundle_zh_CN.properties 2020-03-12 22:48:34 +08:00
laohuaji233
9e8dbfdc03 Update bundle_zh_CN.properties 2020-03-12 21:33:26 +08:00
Prosta4okua
7db5d14048 Update bundle_uk_UA.properties 2020-03-12 11:37:54 +02:00
Aldas
680b2bc6b6 Translated launch.skip.confirm line 2020-03-11 12:12:30 +02:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
unakiritan
12380f54d2 Create short-description.txt
Japanese Steam metadata.
2020-03-10 14:51:43 +09:00
Vanguard
c4d3c18dda Merge branch 'master' into master 2020-03-10 05:44:57 +03:00
Vanguard
424514e037 2 new lines
schematic.replace
schematic.exists
2020-03-10 05:39:14 +03:00
Prosta4okua
521f367286 Update bundle_uk_UA.properties 2020-03-09 19:17:32 +02:00
Aldas
b4df9e37d7 Grammar corrections
grammar corrections
2020-03-09 18:39:43 +02:00