Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,249 Commits 4 Branches 180 Tags
71ee7558abab9a050467f668a2041a5c51b691bb
Commit Graph
12249 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 71ee7558ab Merge remote-tracking branch 'origin/master' v130.1 2021-08-23 14:47:16 -04:00
Anuken 5f4a3e341f #5785 2021-08-23 14:47:11 -04:00
RebornTrack970andGitHub 81f25b76fd TR Fix (#5781) 2021-08-23 14:41:32 -04:00
TakeandGitHub 649c6ddfb3 Japanese Translation (Steam, Android description & Achivements) (#5805) 
* copy English achivement and description file to Japanese folder

* Translate Gameplay, Campaign

* Translate steam achievements

* Translate Gamemodes, Custom&Multiplayer, Editor

* Translate Android desctiption

* Create summary.txt

* remove the sentence to recommend to share in steam workshop

* fix: 個 → 種類

* minor translation change
 2021-08-23 14:36:34 -04:00
SoMall-dumplingandGitHub 3bd3d3aa37 Avoid ambiguity (#5809) 
* Avoid ambiguity

When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.

* Update OverdriveProjector.java

When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.

* Update bundle.properties

* Update bundle.properties

* Update OverdriveProjector.java

bugfix（perhaps）

* Update OverdriveProjector.java

what if

* Update OverdriveProjector.java

InTeReStInG

* Update OverdriveProjector.java

back to the past

* Update OverdriveProjector.java

Now using Math.max.

* Update bundle_bg.properties

* Update bundle_de.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_in_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_pl.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_th.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update OverdriveProjector.java

Maybe this is necessary.

* Update OverdriveProjector.java

The stats are '+50%' ,etc. now.

* Update OverdriveProjector.java

Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
 2021-08-23 12:37:34 -04:00
Prosta4okuaandGitHub fa9573e6dc [UKR] Translation (#5810) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-08-23 12:27:17 -04:00
SharlotteandGitHub b4d19bf71b Update bundle_ko.properties (#5842) 2021-08-23 12:26:27 -04:00
YellOw139andGitHub 0f019f58bd [Bundle][RO] Update (#5839) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5d4ab9ecd7
- Typo fixes & various other improvements

* new button

* derelict changes
 2021-08-23 12:26:15 -04:00
kitutaandGitHub 572166b157 Update bundle_ja.properties (#5813) 
* Update bundle_ja.properties

Corrections to notational errors. //表記揺れの修正
Change to appropriate wording. //適切な語句への変更

* Update bundle_ja.properties

Add and remove. //追加と削除
 2021-08-23 12:26:08 -04:00
JrTRinnyandGitHub e16dba3336 Update bundle_th.properties (#5845) 
* Update bundle_th.properties

* database button
 2021-08-23 12:25:59 -04:00
Anuken b52d645459 #5837 2021-08-23 12:04:54 -04:00
Darkness6030andGitHub 73b24d2966 Update bundle_ru.properties (#5844) 2021-08-23 10:24:36 -04:00
Anuken 006c796da7 Added database button in menu 2021-08-23 10:03:26 -04:00
Anuken 160fdee596 Consistent tile attribute display 2021-08-23 09:12:36 -04:00
Anuken 5cc50b0ff3 Fixed floorSpeedMultiplier being squared 2021-08-22 15:53:07 -04:00
Anuken 3ba2498815 Removed atrax from archipelago waves 2021-08-22 13:44:55 -04:00
Anuken 0a0ec12e6c Allow logic itemDrop to @air 2021-08-22 11:43:14 -04:00
Anuken 9c826a5fdd Merge remote-tracking branch 'origin/master' 2021-08-22 10:21:24 -04:00
Anuken 50d01ef6f8 FlyingComp cleanup 2021-08-22 10:21:20 -04:00
Matthew PengandGitHub b860b2bbfb Don't show core ghosts (#5834) 2021-08-22 09:45:17 -04:00
JrTRinnyandGitHub 7773a3b17b let payload source/void replace each other (#5835) 2021-08-22 09:45:05 -04:00
Anuken c605418e33 public Setting constructor 2021-08-22 09:40:55 -04:00
Anuken 55270996ff Cleanup 2021-08-22 00:36:25 -04:00
Anuken 789fcac439 Merge remote-tracking branch 'origin/master' 2021-08-22 00:35:55 -04:00
Anuken 466118319f Fixed naval units with canBoost = true 2021-08-22 00:35:40 -04:00
fuzzbuckandGitHub 8117aa8046 add 2 new io servers (#5830) 
1 new gamemode which will soon come to existance & placeholder slot for events & possible future gamemode
 2021-08-21 18:05:43 -04:00
Darkness6030andGitHub 6847d2f373 Add HexedPvP server to Global v7 list (#5829) 2021-08-21 14:55:41 -04:00
Anuken f85c078de8 PR cleanup 2021-08-21 11:34:05 -04:00
Matthew PengandGitHub 9cc08ada22 Heal Targetting on Turrets (#5820) 
* Heal Targetting on Turrets

* Just in case
 2021-08-21 11:33:20 -04:00
Sunny KimandGitHub ec1afdfdc4 Hidden blocks only in the Placement UI (#5806) 
* placeablePlayer

* placeablePlayer unlocked
 2021-08-21 11:29:16 -04:00
Anuken 92d3d3cd9c Fixed #5824 2021-08-21 09:54:05 -04:00
Anuken 8d23e335ae Merge remote-tracking branch 'origin/master' 2021-08-20 23:04:47 -04:00
Anuken ec61598a52 Minke ability moved to Oxynoe 2021-08-20 23:04:43 -04:00
彭瑞暄andGitHub c0c0ebb71f Update bundle_zh_TW.properties (#5739) 
1609 lst.lookup not translated for clarity (using original description)
 2021-08-20 23:03:17 -04:00
FatonndevandGitHub c22f6a844e add hexed pvp server (#5819) 2021-08-20 14:29:46 -04:00
Anuken 8b4112f705 Check for repo & display name in mod browser search 2021-08-20 13:35:41 -04:00
Anuken 465afc3128 Sound fixes 2021-08-20 08:54:02 -04:00
Anuken 6730954a2e Fixed particle effect icon offset 2021-08-20 00:16:03 -04:00
Anuken d03049799e Gradle 7.2 2021-08-20 00:06:37 -04:00
Anuken 3a3622bb58 Boss status color fix 2021-08-19 23:42:27 -04:00
Anuken 38ec05807a Disallow logic-building invalid blocks 2021-08-19 23:32:21 -04:00
Anuken 5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken 0ab5f5bb14 hide hidden units in menu 2021-08-19 21:29:50 -04:00
Anuken 4b14008080 Fixed #5812 2021-08-19 17:50:31 -04:00
Anuken e23054d606 Better support for disabling omniMovement 2021-08-19 16:29:49 -04:00
Anuken dc5ca76df0 Merge remote-tracking branch 'origin/master' 2021-08-19 14:20:22 -04:00
Anuken a8b423836e Added unit decal system for mods/future units 2021-08-19 14:20:18 -04:00
Volas171andGitHub a4bd160995 omegahub ip change (last) (#5807) 2021-08-19 10:43:58 -04:00
Anuken 558ee579e1 BlockIndexer null team fix 2021-08-19 09:37:12 -04:00
Anuken 41829b8660 Fixed #5803 2021-08-18 20:10:14 -04:00