Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,441 Commits 4 Branches 180 Tags
ae8f1fa5b1a03a49dca6a78d558d990f61be5f5c
Commit Graph
5578 Commits
Author SHA1 Message Date
Darkness6030andGitHub d254d971a9 Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken 26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
 2021-08-25 09:22:23 -04:00
VizardAlphaGitHubLucien PerregauxAnuken
 		4f22db8db5 Updates bundle_fr.properties (#5663) 
* Updates bundle_fr.properties

Final core launch animation / Added option to skip core animations

* Translation end

* Proper name/impl for "borderless windowed" on Windows

* Mod import progress bar

* WIP team icons

* Improved environmental block internal names

* Update core/assets/bundles/bundle_fr.properties

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>

* payload source and void descriptions

* Game stats cleanup

* Added max units field for wave editor

* Added max units

Co-authored-by: Lucien Perregaux <57545107+Luhrel@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-08-23 16:58:31 -04:00
Anuken 254284760f Hid details of locked content 2021-08-23 15:20:56 -04:00
RebornTrack970andGitHub 81f25b76fd TR Fix (#5781) 2021-08-23 14:41:32 -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
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 2ef9cfdad6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/entities/comp/FlyingComp.java
 2021-08-22 15:53:33 -04:00
Anuken 3ba2498815 Removed atrax from archipelago waves 2021-08-22 13:44:55 -04:00
Anuken a6c8b3a2bd Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-21 10:15:44 -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
Anuken 946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken 5d4ab9ecd7 Added max units field for wave editor 2021-08-19 23:26:39 -04:00
Anuken 9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken 130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -04:00
Anuken ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
kitutaGitHubTake
 		5b61a183cd Update bundle_ja.properties (#5376) 
* Update bundle_ja.properties

* Update bundle_ja.properties

Minor corrections and additions

* Update bundle_ja.properties

* Update bundle_ja.properties

Add 2 lines

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update bundle_ja.properties

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

* Update core/assets/bundles/bundle_ja.properties

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>

Co-authored-by: Take <18237819+Takeno-hito@users.noreply.github.com>
 2021-08-18 10:45:39 -04:00
Sunny KimandGitHub d1271f3e4b Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
JrTRinnyandGitHub 59456b67a1 payload source and void descriptions (#5778) 2021-08-16 08:22:03 -04:00
YellOw139andGitHub 487bc1866a [Bundle][RO] Update (#5668) 
* [Bundle][RO] Update

Changelog:

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

* Update bundle_ro.properties

* Update bundle_ro.properties

* progress

* derelict

* typo

* Update bundle_ro.properties

* Update bundle_ro.properties

* teamwork

* []

* AI

* Агрессоры

* sector info

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties
 2021-08-15 21:24:27 -04:00
Thomas WidyantokoandGitHub 0b99d71bd4 [ID] v7 prealpha translation (#5669) 
* Indonesian bundle update

lenum.controller description and Tar Fields map

* translation bundle sync

* Indonesian translation standardization

* healing status effect

* Indonesian translation for V7

bit confused on line 1611

* [ID] WIP polygonal core protection

* [ID] Updates Indonesian V7 translation

Logic wait & content look up instructions

* [ID] v7 prealpha translation

draft 1

* [ID] v7 prealpha translation part 2

Fixed a line and made changes to untranslated lines.
 2021-08-15 21:24:13 -04:00
SharlotteandGitHub 8d811550e2 Update bundle_ko.properties (#5680) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* They don't like unofficial properties h

* Update bundle_ko.properties

* translated https://github.com/Anuken/Mindustry/commit/b80129e17b9a8345f6a678658f62165393cdda96#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c, https://github.com/Anuken/Mindustry/commit/7e047ef7262be2ffa0ef257d88cc4557521f1134#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c, https://github.com/Anuken/Mindustry/commit/1cf2bd48923a778b18532d0992e6e50ce2b18dd0#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c, https://github.com/Anuken/Mindustry/commit/a5fe8970c6b36fca6f7e80ef551d82f4531d066d#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c, https://github.com/Anuken/Mindustry/commit/1b0de739f935787daf41bb814d35979fbec650e8#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c
* marged from https://github.com/Anuken/Mindustry/pull/5731
 2021-08-15 21:24:07 -04:00
JrTRinnyandGitHub 09486946fc Update bundle_th.properties (#5694) 
* Update bundle_th.properties

* banned unit

* better environment block name

* craters fix + color

* name consistensies

* add new updates
 2021-08-15 21:23:56 -04:00
RebornTrack970andGitHub 3f988cec72 TR Translate (#5770) 2021-08-15 21:23:18 -04:00
Anuken 2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken 1b0de739f9 Sector info list / Minor hint fixes 2021-08-12 22:16:13 -04:00
Anuken a5fe8970c6 Per-team AI settings / Errors for missing player cores 2021-08-12 09:24:20 -04:00
Anuken 1cf2bd4892 Team-specific rules / Player+Enemy team rules 2021-08-11 23:36:06 -04:00
Anuken 90a58388d6 merge 2021-08-10 16:34:57 -04:00
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
Anuken 9c1063c7cc Misc minor bugfixes 2021-08-09 16:53:49 -04:00
Anuken 7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken cc0d7af610 Merge remote-tracking branch 'origin/master' 2021-08-08 13:38:01 -04:00
Anuken 00a2c1aad0 Refactored fireball into FireBulletType 2021-08-08 13:37:55 -04:00
YakuzetandGitHub 99b3420423 fix update TR bundle (#5715) 
translated some new things and fixed some translation
 2021-08-07 18:12:31 -04:00
Anuken b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken 4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken 79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken 1d257c1a35 Mod import progress bar 2021-07-31 10:58:09 -04:00
JrTRinnyandGitHub 589430055e translation update (#5670) 2021-07-30 22:19:27 -04:00
Anuken a7cc6185ad Proper name/impl for "borderless windowed" on Windows 2021-07-30 14:27:46 -04:00