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

3704 commits

Author SHA1 Message Date
YellOw139
d6291ea6c5
Merge branch 'master' into patch-2 2020-09-20 17:47:32 +03:00
Felix Corvus
f7b320e838
Update bundle_ru.properties 2020-09-20 17:47:08 +03:00
YellOw139
c82455d994
#2628 2020-09-20 17:42:19 +03:00
Felix Corvus
dd32b4d39d
Merge branch 'master' into master 2020-09-20 16:56:36 +03:00
Félix Córvus
e907d1a23f Updating bundles 2020-09-20 16:43:15 +03:00
YellOw139
9bdc81e728
Update contributors 2020-09-20 12:11:33 +03:00
YellOw139
a0d81eb18e
[Bundle][RO] Translation Update 
This PR was tested in-game and it's ready to merge at any time (unless marked as draft).

Changelog:
- Changes as per commits c71be9ae32, f53af781ba, 68cf2af6e0, 0bcb48ca31, b4d83f33e9
- Changed Surge Alloy name to 'Supra Aliaj'. 
  The new name is closer to the original, shorter and easier to pronounce. Old name: 'Aliaj de Supratensiune'
- Changed Phase Fabric name to 'Fibră-Fază'.
  It's closer to the original and shorter. Old name: 'Material de Fază'
- Tweaked some stat names
- Tweaked some map editor button names
- Typo fixes & various other improvements
 2020-09-20 12:06:09 +03:00
Anuken
b4d83f33e9
Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors 
F O R C E P R O J E C T O R S
 2020-09-19 21:15:45 -04:00
Anuken
eb8658e140 Mud tweaks / Unit count tweaks 2020-09-19 16:04:50 -04:00
Anuken
84b1c0348d Merge remote-tracking branch 'origin/master' 2020-09-19 14:11:51 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
Anuken
c470c0abe1
Merge pull request #2612 from sk7725/patch-17 
[KO] Update bundle_ko.properties
 2020-09-19 13:26:31 -04:00
Anuken
dcbfc2b7aa Storage team colors 2020-09-19 12:38:24 -04:00
Anuken
eb60b60b4a
Merge pull request #2615 from Remint32/patch-4 
[Bundle] Missing keybind lines
 2020-09-19 12:12:52 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Felix Corvus
68cf2af6e0
missing keybind lines 2020-09-19 17:34:49 +03:00
Felix Corvus
db3eaf9a33
missing lines 2020-09-19 17:29:33 +03:00
Felix Corvus
48f6ed47a6
Merge branch 'master' into master 2020-09-19 17:01:57 +03:00
Felix Corvus
c1efb69a91
Update bundle_ru.properties 2020-09-19 16:58:22 +03:00
Vanguard
742b171d5c
2 new lines 
unit.sei.name
unit.omura.name
 2020-09-19 16:10:07 +03:00
Sunny Kim
8a4dd09137
Update bundle_ko.properties 
+ Lots of environmental blocks(reflects 74cefb3ec9)!
 2020-09-19 20:49:08 +09:00
Anuken
aae045b5dd Outline changes 2020-09-18 21:14:04 -04:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Felix Corvus
4cc90c0f4d
Update bundle_ru.properties 2020-09-18 22:25:59 +03:00
Felix Corvus
80490c401a
Update bundle_ru.properties 2020-09-18 21:38:31 +03:00
Anuken
6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Anuken
ea224bd1f1 many things 2020-09-17 21:05:16 -04:00
Anuken
bdf814c9b9 Removed sector data cache system 2020-09-16 18:38:23 -04:00
Felix Corvus
e1277da02d
Update bundle_ru.properties 2020-09-17 00:49:02 +03:00
Anuken
5c98512e4f Bugfixes 2020-09-16 14:53:44 -04:00
TheSlaylord
b24c5ea920
Update contributors 2020-09-16 18:48:04 +03:00
TheSlaylord
7dfe973664
Update bundle_ru.properties 2020-09-16 18:46:04 +03:00
Anuken
ddcfd0728d Merge remote-tracking branch 'origin/master' 2020-09-16 11:44:46 -04:00
Anuken
9cfd78ee1f Fixed #2565 2020-09-16 11:44:39 -04:00
Anuken
90978b54da
Merge pull request #2558 from sk7725/patch-16 
[KO] Unit name changes
 2020-09-16 10:50:39 -04:00
Anuken
edb776a549
Merge pull request #2521 from YellOw139/patch-1 
Create bundle_ro.properties
 2020-09-16 10:29:07 -04:00
Felix Corvus
41f3fcbe16
Update bundle_ru.properties 2020-09-16 16:01:47 +03:00
Felix Corvus
013995b30d
nicknames fixes 2020-09-16 15:13:25 +03:00
YellOw139
66aacd6ef0
Update bundle_ro.properties 2020-09-16 13:39:28 +03:00
YellOw139
703ad61b72
Update bundle_ro.properties 2020-09-16 13:38:54 +03:00
Thomas Widyantoko
22c2d8b010
Update bundle_in_ID.properties to match with v6 
with fixes from PR #2513, completed(?)
 2020-09-16 13:14:11 +07:00
YellOw139
9e81460adb
Update bundle_ro.properties 2020-09-16 08:18:01 +03:00
YellOw139
71df10c6d8
Update bundle_ro.properties 2020-09-16 07:43:07 +03:00
Sunny Kim
3407520645
[KO] Unit name changes 
[KO] Unit name changes, based on community reactions.
 2020-09-16 10:15:38 +09:00
Anuken
2877bdf0d6
Update bundle_ko.properties (#2475) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2020-09-15 20:36:18 -04:00
Anuken
23c56974b2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
 2020-09-15 19:28:57 -04:00
Anuken
a5ce57e56d Deployment fixes 2020-09-15 19:28:38 -04:00
Prosta4okua
7e2b3a6e2d
Ukrainian translation (#2492) 
* Український переклад :flag_ua:

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Оновлення перекладу до стану 10.09.2020

* Update bundle_uk_UA.properties

* Оновлення на 15.09.2020

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-09-15 18:21:11 -04:00
Anuken
903a2c069e Merge remote-tracking branch 'origin/master' 2020-09-15 18:00:39 -04:00