Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-11-11 14:56:10 +03:00
Code Issues Projects Releases Wiki Activity
7,037 Commits 4 Branches 160 Tags 2.1 GiB
02394973b0
Commit Graph

6013 Commits

Author SHA1 Message Date
sk7725
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' Mounier
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
laohuaji233
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
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 Manzanas
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
a592144291 Catching of schematic preview errors / Fixes #1886 2020-04-22 09:49:04 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Anuken
58e9e0c0de Merged #1882 with some tweaks 2020-04-21 11:02:44 -04:00
Patrick 'Quezler' Mounier
561198f517
Fix issue with uneven dumping 2020-04-18 13:39:12 +02:00
Patrick 'Quezler' Mounier
16a1483f55
Require 4 loading docks to saturate a belt 
Which encourages using them right from the factory, instead of simply connecting it up to a full titanium belt.
 2020-04-18 13:28:32 +02:00
Anuken
eeb8d5ef9c Renamed key fields and table methods 2020-04-17 11:26:59 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier
1acc6461e6
Grow the circle slightly inward 2020-04-16 22:05:55 +02:00
Patrick 'Quezler' Mounier
9864383300
Revert 〃 2020-04-16 21:15:49 +02:00
Patrick 'Quezler' Mounier
41eb51a340
Experiment with visible ports 2020-04-16 21:11:59 +02:00
Patrick 'Quezler' Mounier
da99286826
Remove obsolete valid check 2020-04-16 20:33:52 +02:00