mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-26 15:27:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,346 Commits 4 Branches 160 Tags 2.3 GiB
2ef9cfdad6
Commit Graph

4564 Commits

Author SHA1 Message Date
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
彭瑞暄
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
kituta
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 Kim
d1271f3e4b
Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -04:00
JrTRinny
59456b67a1
payload source and void descriptions (#5778) 2021-08-16 08:22:03 -04:00
YellOw139
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 Widyantoko
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
Sharlotte
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 b80129e17b (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 7e047ef726 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1cf2bd4892 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), a5fe8970c6 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c), 1b0de739f9 (diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c)
* marged from https://github.com/Anuken/Mindustry/pull/5731
 2021-08-15 21:24:07 -04:00
JrTRinny
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
RebornTrack970
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
Yakuzet
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
JrTRinny
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
Anuken
d855840fe2 Fixed #5672 2021-07-30 13:05:12 -04:00
RebornTrack970
676a064b6b
Updated TR bundle to Build 21565 (#5671) 2021-07-30 10:46:25 -04:00
Prosta4okua
59aff44a55
Update bundle_uk_UA.properties (#5540) 2021-07-28 16:58:06 -04:00
YellOw139
aa74679998
[Bundle][RO] Update (#5573) 
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 8041c305ad
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* settings

* Update bundle_ro.properties

* new blocks

* new units I

* new units II

* Update bundle_ro.properties

* Update bundle_ro.properties
 2021-07-28 16:57:54 -04:00
Ksawi
5cb5434ffe
Update bundle_pl.properties (#5572) 
* Update bundle_pl.properties

Added translation of statuses and processor functions. Changed few translations.

* content.status.name

* Update bundle_pl.properties

* Update bundle_pl.properties

* Flares in omura.description

* Update bundle_pl.properties

* Now better?

* Update bundle_pl.properties

* Better names

* Update bundle_pl.properties

* bullet.lightning

* mods.browser

* Badania -> Zbadaj

* Final statuses names (I think)

* Ready to merge

* Tutorial (as in #5206)

* Research

* Final changes
 2021-07-28 10:45:49 -04:00
Catchears
2f71a4092f
german v7 update (#5631) 2021-07-28 10:45:15 -04:00
VizardAlpha
a97573c5a9
Updates bundle_fr.properties (#5611) 
* Updates bundle_fr.properties

Add and translate.
Commits on Jul 13, 2021
Commits on Jul 17, 2021 
Commits on Jul 18, 2021

* Minor. Correcting translation errors

* Add commit

* Add commit

* Add new commit

Translation not finish;
unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.

* Translation finish

* Added hint & tooltip for derelict structures

* Correction of an error

hint.placeTurret = Placez des \fuf861 -> hint.placeTurret = Placez des \uf861

* Fixed #5645

servers.local.steam = Open Games & Serveurs Locaux 

Not finish

* Removed flow rate option
 2021-07-28 10:45:02 -04:00
Sharlotte
108baa467d
Update bundle_ko.properties (#5604) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* halha

* Update bundle_ko.properties
 2021-07-28 10:44:44 -04:00
JrTRinny
193015f1cd
update bundle_th.properties (#5591) 
* separated from `#5491`

* follow latest changes

like settings tooltips, large launch pad removal and clean up team PvP

* follow latest changes

* descriptions for new content

* line spacings and edit errors

* derelict tooltips

* open games

* remove resource flow rate
 2021-07-28 10:44:35 -04:00
Anuken
5ca5025fb1 Final core launch animation / Added option to skip core animations 2021-07-27 19:02:04 -04:00
Anuken
00e3a59463 Land animation progress / IntelliJ android plugin hack 2021-07-27 16:26:13 -04:00
Anuken
adbe55b0db Minor cloud bugfixes / Removed flow rate option 2021-07-27 09:08:09 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
c9ca08ff1c Merge remote-tracking branch 'origin/master' 2021-07-25 12:04:52 -04:00