Commit Graph

7909 Commits

Author SHA1 Message Date
summetdev
eedb90ed16 bigger description area 2020-10-04 15:27:05 +03:00
TheMrAlbert
c1be33cf2f Minor update
These are the minor translations, please review this translation before merging.
Also, block.consecutive (line 611) are left untranslated to allow other translator who are capable to translate it well.
2020-10-04 12:45:08 +07:00
grimsoul10
5d2c36f186 Small changes (#1)
* Small changes
* Capitalizations
2020-10-04 10:48:48 +07:00
Thomas Widyantoko
3e49c68ec2 Updated for missing lines 2020-10-04 10:08:42 +07:00
Wina
903424654d Updates to bundle_es.properties 2020-10-03 22:39:33 -03:00
Gdeft
08dfded0c2 Fix spelling 2020-10-04 07:15:27 +07:00
Anuken
b561b38b56 Fixed #2824 2020-10-03 19:07:16 -04:00
cinnx
6b36b65ac0 Update bundle_pl.properties
fixed some translations; compared, fixed and added few lines from original bundle file
2020-10-03 23:14:11 +02:00
summetdev
5ffff9c151 description for schematics 2020-10-03 22:43:52 +03:00
Anuken
187c98b830 Merge remote-tracking branch 'origin/master' 2020-10-03 15:35:29 -04:00
Anuken
06f9aa5f84 things 2020-10-03 15:35:26 -04:00
ThePythonGuy
50491755d1 typo and stuff 2020-10-03 16:59:39 +02:00
Anuken
9a92e0246e Merge pull request #2807 from MEEPofFaith/patch-1
Define payload capacity of payload conveyors on the conveyor itself.
2020-10-03 10:37:41 -04:00
Anuken
58a62ad19c implicit nullable types 2020-10-03 10:19:00 -04:00
Leonwang4234
60d5048140 Update BulletType.java 2020-10-02 21:25:05 -07:00
MEEP of Faith
8d4dff2481 Change the comment. 2020-10-02 21:22:11 -07:00
MEEP of Faith
f6d805638c Then apply flexibility to the Payload Conveyor
Modding :D
2020-10-02 21:19:53 -07:00
MEEP of Faith
8f1869672d Variable fits limit. 2020-10-02 21:16:45 -07:00
Anuken
7a307bbe9c cleanup 2020-10-02 23:15:52 -04:00
Anuken
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Leonwang4234
e53a1d0472 Update BulletType.java 2020-10-02 19:47:47 -07:00
Leonwang4234
74c0d0d0fd Update BulletType.java 2020-10-02 19:33:11 -07:00
Leonwang4234
ca70b9c705 fix
(again)
2020-10-02 18:28:36 -07:00
Leonwang4234
5aa0ce97b8 fix 2020-10-02 18:27:33 -07:00
Leonwang4234
39e956c934 Update BulletType.java 2020-10-02 18:26:17 -07:00
Leonwang4234
88639fffc5 fix 2020-10-02 18:17:51 -07:00
Leonwang4234
e17ad7a429 Merge remote-tracking branch 'upstream/master' into burning-affects-tiles 2020-10-02 17:47:11 -07:00
Anuken
43936b536e Cleanup 2020-10-02 20:23:37 -04:00
Anuken
5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken
a3224b7082 Improved replacement system 2020-10-02 11:14:18 -04:00
Anuken
138434d029 Fixed #2799 / Fixed #2797 2020-10-02 09:54:08 -04:00
老滑稽
04b03b0749 Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
Anuken
215cfaa42f Fixed #2793 2020-10-01 16:03:13 -04:00
Anuken
68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04:00
Anuken
4074a241d2 Cleanup 2020-10-01 14:07:33 -04:00
Anuken
c1970b4da5 Merge branch 'campaign'
# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java
2020-10-01 13:37:25 -04:00
Anuken
1170880127 Merge remote-tracking branch 'origin/master' 2020-10-01 13:33:55 -04:00
Anuken
199be4d13d Implicit non-nullability for fields 2020-10-01 13:33:43 -04:00
Anuken
085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
老滑稽
b7b2da6bbd Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
Anuken
2604a2d649 Merge pull request #2783 from Quezler/patch-45
Move cryofluid mixer emoji back to the old number
2020-10-01 08:56:28 -04:00
Vanguard
65a0bd9a63 2 lines changed; 1 line added
Changed:
unit.vela.name
block.foreshadow.name

Added:
block.tsunami.name
2020-10-01 14:47:56 +03:00
Patrick 'Quezler' Mounier
ce463d225f Clarify stack conveyor recharge property
(also, should be minimum & multiple of 1)
2020-10-01 11:54:58 +02:00
Patrick 'Quezler' Mounier
8e4d00d594 Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken
4264b960cd Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign 2020-09-30 22:46:33 -04:00
Anuken
b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
Anuken
54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -04:00
Leonwang4234
87b21c052f Update SaveFileReader.java
fix
2020-09-30 18:29:58 -07:00
Leonwang4234
9601c81045 change sprite name 2020-09-30 18:05:43 -07:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00