  LapisandGitHub
|
d97d971cf6
|
Update bundle_ja.properties (#1908)
* update bundle_ja.properties
* update bundle_ja.properties
* update bundle_ja.properties
|
2020-04-25 13:38:00 -04:00 |
|
 Patrick 'Quezler' MounierandGitHub
|
efc1d9040b
|
Add nydus 6.0 server entry (#1909)
|
2020-04-25 12:53:58 -04:00 |
|
 Anuken
|
30d8737f67
|
Bugfixes
|
2020-04-25 12:49:19 -04:00 |
|
|
Anuken
|
9e0af97cee
|
Merge remote-tracking branch 'origin/master'
|
2020-04-25 12:30:22 -04:00 |
|
|
Anuken
|
838e12cc0a
|
stop
|
2020-04-25 12:30:18 -04:00 |
|
 sk7725andGitHub
|
02394973b0
|
Fix inconsistencies in Korean Translation (#1912)
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
|
2020-04-25 12:24:56 -04:00 |
|
|
Patrick 'Quezler' MounierandGitHub
|
14c9050103
|
Remove power usage from phase bridge endpoints (#1910)
|
2020-04-25 10:32:00 -04:00 |
|
|
Anuken
|
81af481d3a
|
Removed sleep
|
2020-04-25 10:12:37 -04:00 |
|
|
Anuken
|
2e2c8ceab4
|
Bugfixes
|
2020-04-25 00:04:14 -04:00 |
|
|
Anuken
|
09e08a474b
|
Plastanium conveyor + bugfixes
|
2020-04-24 20:17:24 -04:00 |
|
|
Anuken
|
21946cafd1
|
Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater
|
2020-04-24 15:46:32 -04:00 |
|
|
Anuken
|
32a182cd01
|
Unit parsing cleanup
|
2020-04-24 15:45:57 -04:00 |
|
|
Anuken
|
6041e238a6
|
Bugfixes
|
2020-04-24 12:01:08 -04:00 |
|
|
Anuken
|
5d4ca753a7
|
Light cleanup
|
2020-04-24 11:08:02 -04:00 |
|
|
Anuken
|
1b2e10d355
|
Cleanup, re-implementations
|
2020-04-24 11:01:17 -04:00 |
|
|
Anuken
|
018fe5dea2
|
Added lights for laser turret projectiles
|
2020-04-24 09:50:40 -04:00 |
|
|
Anuken
|
eeb88df5f6
|
Bugfixes
|
2020-04-23 17:45:12 -04:00 |
|
|
Patrick 'Quezler' Mounier
|
cf186e0219
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/sprites2.png
|
2020-04-23 21:15:11 +02:00 |
|
|
Patrick 'Quezler' Mounier
|
39266d23c8
|
Merge branch 'master' into crater
# Conflicts:
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites3.png
|
2020-04-23 21:10:48 +02:00 |
|
|
Anuken
|
cafd076f9c
|
Fixed water animation conflict
|
2020-04-23 15:08:32 -04:00 |
|
|
Anuken
|
87ed405916
|
Bugfixes
|
2020-04-23 14:50:30 -04:00 |
|
|
Anuken
|
7091cad704
|
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
|
2020-04-23 14:05:09 -04:00 |
|
|
Anuken
|
b68b3a1837
|
Layer tweaks
|
2020-04-23 14:04:31 -04:00 |
|
|
Anuken
|
2aa05f989b
|
Merged in sprite sorting
|
2020-04-23 14:00:55 -04:00 |
|
|
Anuken
|
cec5c24d69
|
progress
|
2020-04-23 13:58:06 -04:00 |
|
|
Anuken
|
c738dcb42e
|
progress
|
2020-04-23 12:52:16 -04:00 |
|
|
Anuken
|
1bf5b19889
|
progress
|
2020-04-23 12:35:49 -04:00 |
|
 laohuaji233andGitHub
|
37240478b8
|
Update bundle_zh_CN.properties (#1900)
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
|
2020-04-23 11:08:33 -04:00 |
|
 RayfulrandandGitHub
|
9e8dae8cd6
|
Update summary (#1901)
more accurate translation of Tower Defence genre
|
2020-04-23 11:07:06 -04:00 |
|
|
Anuken
|
c6e4bf1fa4
|
progress
|
2020-04-23 11:06:58 -04:00 |
|
|
Anuken
|
71e8c088a6
|
progress
|
2020-04-23 11:01:14 -04:00 |
|
|
Anuken
|
989ee895e8
|
Functional sorting
|
2020-04-23 10:25:46 -04:00 |
|
|
Anuken
|
2538273402
|
progress
|
2020-04-23 00:41:18 -04:00 |
|
|
Anuken
|
18b68fefed
|
how did this compile
|
2020-04-23 00:16:41 -04:00 |
|
|
Anuken
|
362846bd68
|
progress
|
2020-04-23 00:03:03 -04:00 |
|
|
Anuken
|
6cf422eebf
|
progress
|
2020-04-22 17:23:30 -04:00 |
|
 Álvaro ManzanasandGitHub
|
cf69fa1d7c
|
Update bundle_es.properties (#1899)
* Update bundle_es.properties
* Update bundle_es.properties
|
2020-04-22 16:20:07 -04:00 |
|
|
Anuken
|
fc4f8619f8
|
progress (purge)
|
2020-04-22 16:17:43 -04:00 |
|
|
Anuken
|
c5f93139bd
|
progress
|
2020-04-22 16:06:26 -04:00 |
|
|
Anuken
|
9beb23b0e4
|
progress
|
2020-04-22 15:19:39 -04:00 |
|
|
Anuken
|
d154361e75
|
Merge branch '6.0' of https://github.com/Anuken/Mindustry into sprite-sorting
|
2020-04-22 14:34:34 -04:00 |
|
|
Anuken
|
67d87f023b
|
Cleanup
|
2020-04-22 14:22:33 -04:00 |
|
|
Anuken
|
da7c393096
|
progress
|
2020-04-22 12:47:29 -04:00 |
|
|
Anuken
|
b3f936acb8
|
Fixed tests not compiling
|
2020-04-22 11:18:19 -04:00 |
|
|
Anuken
|
2ca62831e3
|
Revert "Cleaned up tests" (wrong branch)
|
2020-04-22 11:17:47 -04:00 |
|
|
Anuken
|
cb601b729e
|
Merge remote-tracking branch 'origin/master'
|
2020-04-22 10:48:54 -04:00 |
|
|
Anuken
|
cc4e9c5ba1
|
Cleaned up tests
|
2020-04-22 10:48:50 -04:00 |
|
|
Anuken
|
a592144291
|
Catching of schematic preview errors / Fixes #1886
|
2020-04-22 09:49:04 -04:00 |
|
 Kaio Duarte CostaandGitHub
|
390b5e3b60
|
Update bundle_pt_BR.properties (#1881)
|
2020-04-21 11:03:25 -04:00 |
|
|
sk7725andGitHub
|
05cfe7a80a
|
Fixed inconsistencies with the word 'schematic' (#1892)
설계도 and 회로도 are both schematic.
|
2020-04-21 11:03:09 -04:00 |
|