mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-27 01:01:09 -07:00
Code Issues Projects Releases Wiki Activity
9277 commits 4 branches 182 tags 2.4 GiB
Commit graph

3704 commits

Author SHA1 Message Date
Anuken
ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken
148abaccd9 Cleanup 2020-03-21 16:40:39 -04:00
TheJaaju
998cc9535e
Update bundle_fi.properties 
Titles
 2020-03-19 22:54:08 +02:00
Anuken
c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04: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
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
 2020-03-17 20:03:12 -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
Anuken
32ffacf8f6 Added sector deployment UI 2020-03-16 23:09:07 -04: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
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
4f195b72d1
Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
ma44
ec34e27102
map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -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
Anuken
06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04: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
Anuken
930c342fb6 Shader cleanup 2020-03-10 19:48:38 -04: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
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
Anuken
7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Anuken
60d28fb01b Bugfixes 2020-03-06 16:07:07 -05:00
Anuken
f8b554aff8 Fixed some basic crashes 2020-03-06 15:30:51 -05:00
Anuken
73c0ebb75f Fixed most errors in block package 2020-03-06 14:41:38 -05:00
Anuken
89a5c957fd
add mod name to js print() (#1677) 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Patrick 'Quezler' Mounier
14a97976cc
Realign pixels 
Bothered me for ages.
 2020-03-05 19:48:36 +01:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly 2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts 2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description 2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
 2020-03-05 10:00:02 +01:00
Anuken
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties (#1636) 
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
 2020-03-04 13:52:20 -05:00
Vanguard
307f9ee297
2 changed lines 
link.trello.description
link.feathub.description
 2020-03-04 19:51:48 +03:00
Vanguard
1bbdedec72
1 changed line 
join.info
 2020-03-04 14:59:57 +03:00