mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-02 04:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,890 Commits 4 Branches 160 Tags 2.3 GiB
7f9e32a74c
Commit Graph

3256 Commits

Author SHA1 Message Date
Anuken
fef4882c15 Turbine generator tweaks 2020-06-13 12:08:03 -04:00
Anuken
3b3a1dd496 Editor map fix / Crafter renderer system 2020-06-13 10:33:19 -04:00
Anuken
27522ae494 Icon generation improvements 2020-06-12 19:41:06 -04:00
Anuken
2bd3bc0e13 Reconstructor fixes 2020-06-12 18:41:35 -04:00
Anuken
a47e300297 Cleanup 2020-06-12 14:57:57 -04:00
Anuken
a76cb3cb1a Scrapped reaper segments 2020-06-12 13:32:00 -04:00
Anuken
ce9f515543 Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
Anuken
e247b092dc cleaning up mistakes 2020-06-11 13:42:22 -04:00
Anuken
732769524c 🔥🔥🔥 2020-06-11 12:03:27 -04:00
Math2128
917db20e76
Update bundle_fr.properties 2020-06-10 23:10:00 -04:00
Anuken
2a9008f042 Transition to Framebuffer#blit 2020-06-10 21:07:21 -04:00
Math2128
c5df9aa814
Update bundle_fr.properties 
Ligne 644: Le jeu ne se met pas en pause pendant que l'on construit, même avec cette option de cocher. En fait, cela met la construction sur pause et attend que l'on appuie sur la touche E (par défaut) pour confirmer la construction. Je trouvais l'ancien nom assez trompeur, et je l'ai donc changer comme cela. 

I'm at line 762
 2020-06-10 19:20:31 -04:00
Anuken
2b1bd90dfa Out of atlas space / GL30 progress 2020-06-10 12:55:01 -04:00
Math2128
61d212128a
Update bundle_fr.properties 
line 709
 2020-06-09 23:47:13 -04:00
Anuken
a51a8d7473 Added cool new reconstructors™️ 2020-06-09 23:11:02 -04:00
Anuken
9fbe421905 Sprites 2020-06-09 17:04:38 -04:00
Math2128
778b61914a
Update bundle_fr.properties 
Correction de quelques fautes de frappe lors des modifications des descriptions des tourelles.
Fixed some typos about turret descriptions.
 2020-06-09 14:04:00 -04:00
Anuken
99518f4e1d Functioning 5x5 reconstructor 2020-06-08 21:34:08 -04:00
Anuken
6501071510 Cleanup, renaming 2020-06-08 21:03:29 -04:00
Anuken
43762e82a8 Unit tweaks 2020-06-08 16:33:21 -04:00
Math2128
758b327639
Update bundle_fr.properties 
Quelques changements aux descriptions des tourelles pour s'ajuster aux définitions anglaises et dans le but d'homogénéiser les descriptions. Je ne suis pas sur au niveau du Cyclone.
Some changes about the turret descriptions to fit more the english description.
 2020-06-08 15:07:50 -04:00
Anuken
bb9855e830 Merge remote-tracking branch 'origin/master' 2020-06-08 11:52:27 -04:00
Anuken
1f905790e7 kinematic lerp 2020-06-08 11:45:48 -04:00
Summet
af3423d94a
Add newline to contributors file (#2156) 2020-06-08 10:20:59 -04:00
Anuken
5869b7d27e leg 1 2020-06-08 10:03:46 -04:00
Math2128
be50ededcd
Update bundle_fr.properties 
Because I made typos translating the tutorial
 2020-06-07 21:35:00 -04:00
Math2128
f7a7521120
Update bundle_fr.properties 
Worked on the « may be subject to a lot of changes» tutorial.
 2020-06-07 21:09:40 -04:00
Math2128
5ca1d66755
Update bundle_fr.properties 2020-06-07 20:01:36 -04:00
Anuken
36ce04e8f0 fuse fix 2020-06-07 18:26:45 -04:00
Petr Gašparík
cd1918e337 Czech translation - update with cleanups 2020-06-08 00:00:56 +02:00
Petr Gašparík
269a92a723 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-07 23:56:42 +02:00
Anuken
210971fedb Bugfixes 2020-06-07 17:22:17 -04:00
Math2128
68cfd1790a
Update bundle_fr.properties 
Line 633
 2020-06-07 13:44:12 -04:00
Anuken
8993c1db04 Fixed editor crash 2020-06-07 13:28:22 -04:00
Anuken
9574f742e1 Eruptor legs 2020-06-07 11:15:25 -04:00
키에르
09d42773a6
Match 69d0751e65 2020-06-07 22:29:03 +09:00
키에르
b9b57f7908
Finish 2020-06-07 22:03:43 +09:00
Math2128
409cc219f1
Update bundle_fr.properties 
Line 476
 2020-06-07 00:45:57 -04:00
Math2128
f940f96a14
Update bundle_fr.properties 
Fixed some more typos and added a few translation lines (259 to 462)
 2020-06-06 15:16:02 -04:00
Anuken
65e94850ca Sprite tweaks 2020-06-05 20:59:30 -04:00
Anuken
685f915656 Various fixes 2020-06-05 18:03:57 -04:00
Anuken
1ef546b578 Base tweaks 2020-06-05 16:42:52 -04:00
Anuken
50422aaac5 Base bugfixes 2020-06-05 16:33:55 -04:00
Anuken
597d58e843 Power network base support 2020-06-05 14:23:57 -04:00
Anuken
b3ff616af2 Better generation 2020-06-05 13:42:48 -04:00
Anuken
cf02a75846 Support for schematic random rotation 2020-06-05 13:23:24 -04:00
Math2128
fa665468d3
Update bundle_fr.properties 
Fixed some typos here and there (line 1 to 258)
 2020-06-05 12:02:56 -04:00
Anuken
d9e05907af Basic schematic based generation 2020-06-05 10:45:57 -04:00
Anuken
803f9e8eb6 Made save format support removed blocks 2020-06-04 14:50:08 -04:00
Ali-C-Ila
0e7c70fe3c
Update bundle_zh_TW.properties 2020-06-04 18:44:30 +08:00
soytheLB
d2d0be7759
Update bundle_es.properties 
added line 275 respawn
changed  waves.boss to waves.guardian

added bar.units
removed bar.
 2020-06-04 05:16:04 -03:00
Anuken
5bcaed54c6 3x3 separator 2020-06-03 19:42:42 -04:00
Anuken
45c2cd7ac3 Large overdrive projector 2020-06-03 17:23:45 -04:00
Anuken
6fff4ad8a1 Point defense blocks 2020-06-03 16:22:07 -04:00
Anuken
3c89ccf7c3 Added silicon crucible 2020-06-03 12:11:40 -04:00
Anuken
7f6dcbd75a Cleanup 2020-06-03 01:27:40 -04:00
Anuken
0382d40dcc Payload router 2020-06-03 01:13:44 -04:00
Anuken
69d0751e65 Cleanup 2020-06-01 18:55:19 -04:00
Anuken
8273198c56 Bugfixes 2020-06-01 11:12:06 -04:00
Anuken
5b4a22e219 Implemented #1329 2020-05-31 20:16:32 -04:00
Anuken
bd349803d3 Moved some blocks around 2020-05-31 14:39:10 -04:00
Anuken
0842c3f0a0 Progress on sector state 2020-05-30 21:04:41 -04:00
Ali-C-Ila
95ade7f32a
Update bundle_zh_TW.properties 2020-05-30 19:48:14 +08:00
Anuken
b08eafc78e Revenant 2020-05-29 20:08:23 -04:00
Anuken
780c4208bb Cleanup 2020-05-29 13:58:53 -04:00
Anuken
d851a09944 Cleanup 2020-05-29 13:52:42 -04:00
Petr Gašparík
5119959b0f Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-05-28 08:23:37 +02:00
Anuken
92d265402b Payload support 2020-05-27 18:11:42 -04:00
Petr Gašparík
6a8d66c169 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-05-27 15:41:18 +02:00
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Petr Gašparík
645e66fe71 Czech translation - color correction 2020-05-26 22:20:15 +02:00
Anuken
a7c7295893 Various tweaks 2020-05-26 12:59:05 -04:00
Anuken
c1d4a4851f Better leg sprite support 2020-05-26 10:57:02 -04:00
Petr Gašparík
671162e700 Czech translation - type 2020-05-26 13:43:35 +02:00
Petr Gašparík
34d9193cd8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-05-26 13:33:21 +02:00
Anuken
39e3ae931c more legs 2020-05-25 22:19:31 -04:00
Anuken
aae6d2038b Payload API changes 2020-05-25 15:03:31 -04:00
Anuken
1ae9d04f47 Experimental: block loader/unloaders 2020-05-25 14:36:40 -04:00
Ali-C-Ila
d636242b6f
Update bundle_zh_TW.properties 2020-05-25 18:37:57 +08:00
Petr Gašparík
b2382ac429 Czech translation - up to date! 2020-05-25 10:25:21 +02:00
TheJaaju
de42cd6250
Update bundle_fi.properties 
- Fixed typos
- Added translations
 2020-05-25 10:52:44 +03:00
Anuken
0e59a22cbe Respawn key 2020-05-24 22:27:14 -04:00
Anuken
e8869c07fe Removed respawn time rule 2020-05-24 17:05:31 -04:00
Anuken
503b947fb7 Sprite tweaks 2020-05-24 08:38:47 -04:00
Anuken
65f63fd4d2 Re-added Tau 2020-05-23 21:53:11 -04:00
Anuken
df08498d70 Bugfixes 2020-05-23 19:14:48 -04:00
Anuken
46bc2207ff Initial reconstructor impl 2020-05-23 18:49:28 -04:00
Anuken
39b0051b73 Directional unit factories (unfinished) 2020-05-23 10:39:44 -04:00
Anuken
f250008db3 Cleanup 2020-05-22 20:00:02 -04:00
Anuken
76aa201a99 Name changes / Bugfixes 2020-05-22 17:37:38 -04:00
Anuken
12d9479184 Added dart as default starter 2020-05-22 14:35:25 -04:00
Anuken
b683c3f8d5 ... 2020-05-21 21:15:39 -04:00
Anuken
61d9fd3d72 Cleanup / Armor support 2020-05-21 14:57:15 -04:00
Ali-C-Ila
ee288fbd3b
Update bundle_zh_TW.properties 2020-05-21 20:32:37 +08:00
Izzat Nasrun
196a79a10c togglable in settings.game 
fix zoom independency
 2020-05-21 12:26:20 +08:00
Anuken
5b445c59c1 Implemented ground mech boosting 2020-05-20 18:48:04 -04:00
Anuken
78f24b8840 Support for wave shields 2020-05-20 17:16:18 -04:00
Anuken
aa19c80567 Targeting bugfixes 2020-05-20 13:56:17 -04:00
Anuken
1bc7454146 Unit tweaks 2020-05-19 21:05:34 -04:00
Anuken
945be0c524 Various tweaks 2020-05-19 17:49:25 -04:00
Anuken
4edd024015 Merge remote-tracking branch 'origin/master' 2020-05-19 14:58:08 -04:00
Anuken
77c0163a79 Re-implemented some units / Bugfixes 2020-05-19 14:58:04 -04:00
Przemyslaw Paluch
0af1e549f8
Fixed typos in Polish translation (#2083) 2020-05-18 20:24:21 -04:00
Anuken
530ff9761b Fixed core selection in preset sectors 2020-05-18 15:38:56 -04:00
Ali-C-Ila
255edd94f8
Update bundle_zh_TW.properties 2020-05-18 23:11:18 +08:00
zethnest
dafe629c1d
fix coloring (#2077) 2020-05-18 08:37:10 -04:00
Anuken
d9751dbc6d Sector preset support / Per-player votekick cooldown 2020-05-17 11:12:22 -04:00
키에르
3a62bfa8ce
Update bundle_ko.properties 2020-05-17 16:07:21 +09:00
키에르
d61da30c15
Update bundle_ko.properties 2020-05-17 02:05:33 +09:00
Anuken
6938c69d97 Minor planet dialog polish 2020-05-15 22:24:01 -04:00
GioIacca9
898c07c4af
Minor changes 2020-05-15 16:21:39 +02:00
Anuken
b84ec4ff8e Merge remote-tracking branch 'origin/master' 2020-05-14 23:16:34 -04:00
Anuken
434a754c9a Better pad animations / Balancing 2020-05-14 23:16:26 -04:00
sk7725
8c501fa10b
[KO] Small Revert (#2059) 
Readd translator credits(Kieaer said he removed it temporarily, and also https://discord.com/channels/391020510269669376/395414970793459714/710497552071655484)
 2020-05-14 22:00:24 -04:00
Anuken
a4987f864f Refactoring / Launch pad tweaks 2020-05-14 22:00:04 -04:00
Olexandr Nesterenko
b99dba808e
Merge branch 'master' into patch-2 2020-05-14 08:54:42 +03:00
Olexandr Nesterenko
89f3511082
Update bundle_uk_UA.properties 2020-05-14 08:53:13 +03:00
Anuken
8abe6c4270 Merge remote-tracking branch 'origin/master' 2020-05-13 17:05:10 -04:00
Anuken
04dc701c25 Various campaign-related tweaks 2020-05-13 17:04:59 -04:00
zethnest
2dfa334ba6
Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
ian
b758b69243
Partially add to and fix swedish translations (#2052) 2020-05-13 14:37:05 -04:00
Anuken
ab49825d35 Merge remote-tracking branch 'origin/master' 2020-05-12 21:34:40 -04:00
Anuken
6a22d45320 Prototype unit cap mechanic 2020-05-12 21:34:27 -04:00
Summet
fea5142955
Replaced all upper-case colors to lower-case (#2044) 2020-05-12 20:03:35 -04:00
Alberto Galera
4910afbc82
Fix translation typo (#2045) 
* Fix translation typo

* typo
 2020-05-12 20:03:23 -04:00
Anuken
f6d8658ee2 Fixed #2040 / Fixed #2039 / Fixed #2038 / Fixed #2037 / Fixed #2035 2020-05-12 09:34:26 -04:00
sk7725
911424b2e2
Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Anuken
8e50228df2 Merge remote-tracking branch 'origin/master' 2020-05-11 13:20:38 -04:00
Anuken
9cca79adaa Fixed #2032 2020-05-11 13:20:27 -04:00
Lapis
130eee35ec
Update bundle_ja.properties (#2029) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix
 2020-05-11 10:46:34 -04:00
Olexandr Nesterenko
709d3751d1
Update bundle_uk_UA.properties 2020-05-11 12:20:46 +03:00
Olexandr Nesterenko
4545033f12
Update bundle_uk_UA.properties 2020-05-11 11:20:48 +03:00
Anuken
03d0849538 Merge remote-tracking branch 'origin/master' 2020-05-11 00:41:39 -04:00
Anuken
3ea2360290 Removal of unused assets/classes 2020-05-11 00:41:35 -04:00
TheMainOne
a5b235d829
Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec
Update bundle_ja.properties (#2026) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties
 2020-05-10 22:48:14 -04:00
Anuken
a344c1a5d0 Better sun 2020-05-10 19:17:08 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd
Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Lapis
53d60e9cf6
Update bundle_ja.properties (#2013) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo
 2020-05-09 10:21:34 -04:00
Anuken
95a1d84eb9 Support for weather in rules / Sector weather 2020-05-08 21:51:17 -04:00
valtsu41
dcaf0dded5
Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0
Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
Anuken
cda3c3743b Merge remote-tracking branch 'origin/master' 2020-05-08 09:30:48 -04:00
Anuken
4f3cf9466e Less water 2020-05-08 09:30:40 -04:00
laohuaji233
e5e325b25b
Update bundle_zh_CN.properties (#2007) 2020-05-08 09:20:44 -04:00
Anuken
372b1311f7 Merge remote-tracking branch 'origin/master' 2020-05-07 21:37:54 -04:00
Anuken
2b9d618bd2 Implemented various suggestions 
- Pathfinding weighs walls more
- C disables all HUD
- Unloader doesn't store items
- Some bugfixes
 2020-05-07 21:37:41 -04:00
Lapis
1fd22f6d10
Small fix bundle_ja.properties (#1992) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f
Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
Anuken
5aec051d9b progress 2020-05-06 19:07:37 -04:00
Anuken
346ac88009 Merge remote-tracking branch 'origin/master' 2020-05-05 14:28:51 -04:00
Anuken
07074046e6 Cleanup 2020-05-05 14:28:37 -04:00
LFlicker
735187e78a
Update bundle_ko.properties (#1986) 
* Update bundle_ko.properties

Typo correction

* Update bundle_ko.properties

* Update bundle_ko.properties

Typo Correction
 2020-05-05 11:06:32 -04:00
Anuken
4161698bb8 Removed quote requirement for events 2020-05-04 18:05:47 -04:00
Anuken
a4bd1dcc6d Mod event support 2020-05-04 17:57:08 -04:00
Koteyka_by
c920902481
Update bundle_be.properties (#1977) 
Fix a errors in a translate
 2020-05-04 09:09:58 -04:00
Anuken
23cb249c19 Possible scroll fix 2020-05-04 08:59:56 -04:00
Anuken
07a4b64b8a Removed unnecessary functional methods / Script cleanup 2020-05-04 00:01:45 -04:00
Anuken
834c15a808 client/server separation 2020-05-03 21:45:46 -04:00
xetrov05
c83ae5d34c
Translation to ZH_TW (#1974) 2020-05-03 17:50:57 -04:00
Summet
63d2d32fd8
Update bundle_ru.properties (#1972) 2020-05-03 11:45:41 -04:00
Ali-C-Ila
e7c3c3f199
Update bundle_zh_TW.properties (#1965) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-05-02 10:13:01 -04:00
Lapis
33d9501dd2
Update bundle_ja.properties (#1963) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag
 2020-05-01 23:55:22 -04:00
키에르
211be67e0e
Update bundle_ko.properties (#1948) 2020-05-01 12:24:01 -04:00
Anuken
cdc8d2bfe4 Removed experimental tag 2020-05-01 11:31:25 -04:00
DarkenWizMan
f8a24bc3a1
fixed more misspells, added new words (#1956) 
unit factory and drone changed to lithuanian counterparts
 2020-05-01 10:06:16 -04:00
Anuken
626a06ca00 Bugfixes / Better titan sprite 2020-04-30 18:21:50 -04:00
Anuken
d50092e9a2 Merge remote-tracking branch 'origin/master' 2020-04-30 14:46:30 -04:00
Anuken
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
DarkenWizMan
864d6977ff
fixed mispels, added new words (#1945) 
Removed some capital letters, because in lithuanian names of things don't have capital letters in all words, only first word (unless each word gets it's own row). I was too unsure if I should change machine name capital letters.
Also changed uncorrectly used words.
Added new words.
NOTE: I haven't looked through all stuff, so, I may have missed something.
 2020-04-30 12:34:02 -04:00
Ali-C-Ila
d3c9689fff
Update bundle_zh_TW.properties (#1940) 2020-04-29 10:21:50 -04:00
bluet-it
7bffc66b3d added incomplete hungarian translation 2020-04-29 15:58:35 +02:00
TheSlaylord
ae472fb03d
Update bundle_ru.properties (#1931) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2020-04-28 15:05:41 -04:00
Kittiskov
58cbfa599a
Update(Not complete yet) (#1381) 
I didn't update all these yet, because I have to sleep (yawn).

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-04-28 14:16:40 -04:00
Daan Breur
40ea1c865d
[LANG] NL Some Small Changes (#1546) 2020-04-28 12:32:09 -04:00
Lapis
1836cf9582
Update bundle_ja.properties (#1930) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-28 12:27:07 -04:00
GioIacca9
eef4137a59
Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Prosta4okua
ab0cb0c019
Ukrainian translation (#1924) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (fixed)

confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (yet again)

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Стан з гілки master взято

* Оновлено на 26.04.2020

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-04-28 12:26:52 -04:00
sk7725
14de9d7f5f
6.0 unit and block Korean Translation #1 (#1936) 2020-04-28 12:25:31 -04:00
Wina
621fa7862c
Updated Spanish Bundle (#1937) 
* Minor fixes

* Added Plastanium Conveyor Translation
 2020-04-28 12:25:11 -04:00
Anuken
2504fd536b Autopack sprites when running 2020-04-27 17:35:10 -04:00
Anuken
f6bf229b0a Cleanup 2020-04-26 21:59:49 -04:00
Prosta4okua
f905245b71
Revert "Update bundle_ru.properties" 2020-04-27 00:50:15 +03:00
Summet
8860dab37a
Update bundle_ru.properties 
Rename "Целостность" to "Здоровье"
 2020-04-26 21:15:38 +03:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Patrick 'Quezler' Mounier
5fc8901e0b
Fix plastanium conveyor icon generation (#1920) 2020-04-26 11:08:27 -04:00
Lapis
02fbc56137
Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Anuken
fa62336096 Cleanup 2020-04-25 23:14:12 -04:00
Anuken
8b7d75c5ba Unit tweaks 2020-04-25 22:48:25 -04:00
Anuken
c875bb3f55 Merge remote-tracking branch 'origin/master' 2020-04-25 17:34:39 -04:00
Anuken
ceee1d36e6 Bugfixes 2020-04-25 17:34:35 -04:00
Gdeft
9260cdee95
Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
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
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
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
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00