mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 01:35:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
10,742 Commits 4 Branches 160 Tags 2.3 GiB
0b6194cfc9
Commit Graph

9111 Commits

Author SHA1 Message Date
Lapis
0b6194cfc9
Update bundle_ja.properties (#4210) 
* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2021-01-01 11:32:15 -05:00
Lonami
044fb30b1b
Support inline comments (#4196) 
* Support inline comments

Closes https://github.com/Anuken/Mindustry-Suggestions/issues/1698.

* Apply suggestions from code review

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>

* Stick with Mindustry formatting style

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-12-31 16:30:35 -05:00
MEEP of Faith
ab19e6ffbd
Launchpad Launch Sound (#4146) 
* Launchpad Launch Sound

* Update LaunchPad.java
 2020-12-30 19:27:50 -05:00
Anuken
f5410c5712 #4129 2020-12-30 16:58:42 -05:00
Patrick 'Quezler' Mounier
b79a6f6b32
Fix block status of repair point and battery (#4187) 
* Fix block status of repair point and battery

* Update Battery.java

* Update RepairPoint.java
 2020-12-30 15:30:49 -05:00
Anuken
9b087dc55d Fixed #4183 2020-12-30 10:05:18 -05:00
Anuken
8d10cafc99 Merge remote-tracking branch 'origin/master' 2020-12-29 19:48:36 -05:00
Anuken
6e1eedc1ab Cleanup 2020-12-29 19:48:30 -05:00
Thomas Widyantoko
f5ce75e962
yet another in_ID translation update (#4086) 
* yet another in_ID translation update

* more id translate

Co-authored-by: Quick-Korc <68910156+Quick-korkc@users.noreply.github.com>
 2020-12-29 17:40:59 -05:00
YellOw139
0d643a3ece
[Bundle][RO] Translation update (#4115) 
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 43757a247e
- Typo fixes & various other improvements

* no
 2020-12-29 17:40:22 -05:00
Vajda Simon
9632fc5f1f
bundle_hu.properties (#4170) 
I'am continue translating and adding lines to v6.
 2020-12-29 17:39:55 -05:00
Anuken
83b20a90e6 Merge remote-tracking branch 'origin/master' 2020-12-29 11:40:57 -05:00
Anuken
f89f1e2346 critical fix 2020-12-29 11:40:53 -05:00
Sharlotte
cc6b0c328f
update KO bundles (#3956) 
* Update steam description for 6.0 update

* Update achievements.vdf

* oops.

* Update full_description.txt

* Update summary.txt

* add recent changelog

* Update bundle_ko.properties

* last update on this week

(well, sunday)

* upload android recent change-log
 2020-12-29 10:44:19 -05:00
Catchears
e17bcd6a01
fix german translation for editor.unsaved (#4169) 2020-12-29 10:40:29 -05:00
Anuken
6357c17f8a Fixed #4164 / Fixed #4159 2020-12-29 10:13:27 -05:00
Anuken
add3fd9fb3 Merge remote-tracking branch 'origin/master' 2020-12-28 14:52:33 -05:00
Anuken
98e6303765 Bugfixes 2020-12-28 14:51:50 -05:00
Patrick 'Quezler' Mounier
0e1e399788
Draw reconstructor in region during placement & unconnected (#4143) 
* Draw reconstructor in region during placement & unconnected

* Same as the previous commit, but for block loaders & unloaders
 2020-12-28 12:23:06 -05:00
Patrick 'Quezler' Mounier
d84a36b8ee
Block loader/unloader progress bar changes (#4138) 
* Change block loader/unloader progess bar color & bundle

ammo -> items

* Make block unloader bar go down
 2020-12-28 10:44:59 -05:00
Anuken
db40f154c5 Sector damage tweaks 2020-12-28 10:42:51 -05:00
Patrick 'Quezler' Mounier
e714d44a0e
Return large launchpad item costs (#4134) 
* Return large launchpad item costs

hidden -> debugonly

* Remove the 4 orange squares from the large launch pad

Leaving the lights and launchpod alignments alone since that is campaign only.
 2020-12-28 09:38:58 -05:00
Anuken
3ef67cab69 Fixed #4147 2020-12-27 20:41:29 -05:00
Anuken
72686b3ef8 Merge remote-tracking branch 'origin/master' 2020-12-27 16:20:17 -05:00
Anuken
990562dd71 Use sector preset name for maps if possible 2020-12-27 16:20:06 -05:00
Patrick 'Quezler' Mounier
2239ca6372
Remove 4 square blocks from the accelerator (#4139) 
* Normalize rule comment line endings

Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself.

* Add files via upload

* Add files via upload
 2020-12-27 13:32:04 -05:00
Anuken
f174d1b2b4 Faster power graph reload / Fixed iOS editor margin 2020-12-27 12:59:49 -05:00
Anuken
a04e7d5612 Merge remote-tracking branch 'origin/master' 2020-12-27 10:16:39 -05:00
Anuken
16778ea16c Fixed #4141 / Fixed #4136 2020-12-27 10:16:34 -05:00
Sunny Kim
a606d9d85c
bugfixes, call me the mother of the block forge (#4135) 
(anuke is the father)
 2020-12-27 10:04:19 -05:00
Sunny Kim
8d18649323
Block (un)loader major improvements (#4127) 
* make it consider consVaild

* make this too

* pattern style and max block size

* Is there a better way to do this?

* Update BlockUnloader.java

* do not the /0

* prevent /0

* test 1

* yup it works for enabled
 2020-12-26 22:10:37 -05:00
Anuken
c02d603a7a Search bar cleanup 2020-12-26 11:39:58 -05:00
DeltaNedas
8e4b35eb07
SearchBar class - add search bars to mods (#3267) 
* Create SearchBar and make ModsDialog use it

* add search bar to servers

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* a

* fix mods menu not rowing

* remove search bar for remote servers

* h

* hide searchbar on landscape mobile

* anukes feedback

* Update core/src/mindustry/ui/SearchBar.java

Co-authored-by: Anuken <arnukren@gmail.com>

* java dumb

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-12-26 11:22:11 -05:00
Anuken
fda9357b4b Fixed #4128 2020-12-26 09:49:03 -05:00
Anuken
4517b55f76 Building priority fix 2020-12-26 09:43:45 -05:00
Anuken
f014339dbc Don't render weather in full map screenshots 2020-12-25 21:51:25 -05:00
Anuken
9f8fce72d3 Better build beam visuals 2020-12-25 21:49:10 -05:00
Anuken
834e4f175b Fixed #4122 2020-12-25 15:56:53 -05:00
Anuken
bba52e99e0 Fixed #4121 2020-12-25 12:34:02 -05:00
Anuken
4339042078 Fixed #4120 2020-12-25 10:57:54 -05:00
Anuken
f86291c587 Merge remote-tracking branch 'origin/master' 2020-12-25 01:26:24 -05:00
Anuken
da96b23441 Higher power source output 2020-12-25 01:26:20 -05:00
彭瑞暄
d2ae9cf809
Up-to-date zh-TW translations (#4083) 
* Update bundle_zh_TW.properties

Corrected some machine translations. Modified some others for more clear understanding.

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

new translations 1

* Update bundle_zh_TW.properties

New translations 2

* Update bundle_zh_TW.properties

New translations 3

* New translations 1-3

Removed "zones" from v121.4: "Fixed sectors not auto-unlocking".
衝擊反應堆 -->動能反應爐

* New translations 1-4

* New translations 1-5

* New translations 1-6

up to line 1250

* Indexing finished. Translations 1-7

lines are now matching with English bundle.

* update bundle_zh_TW.properties

* edit zh_TW

* zh-tw

* community server disclaimer

* Finished sector descriptions, slight modifications

up to line 606

* zh-TW

* Many translations, include Always-on weather rule

* corrected missing character

* Update achievements.vdf

Oct not translated

* Update description.txt

* bundle_zh_TW.properties

* Bullet stats update, hints finished

* added line: public confirm really

* contributors

* Merging conflicts

Almost done...

* Synced

* Update ammo-stat translation

* Update contributors

* Unit names

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Review (#15)

* Update bundle_zh_TW.properties

* Unit names

* Update bundle_zh_TW.properties

* Finished

Please review

* minor correction

* minor correction

Hopefully there are no more "minor corrections" required.

* Review

* Close inspection

* Revisions, change chat mode

* Sapping Correction

Co-authored-by: simba-fs <simba.fs@gmail.com>
Co-authored-by: Simba-Fs <39305460+simba-fs@users.noreply.github.com>
 2020-12-25 00:03:35 -05:00
Sunny Kim
beed2e0b8f
Block Forge improvements (#4112) 
* minBlockSize, maxBlockSize, icon

* removed fixed size

* same line

* revert to 3

* I almost forgot
 2020-12-25 00:02:15 -05:00
Anuken
eda6770e11 Fixed mined item flashing on clients 2020-12-24 23:17:35 -05:00
Antsiferov Andrew
43757a247e
[QoL] Chat modes (#3869) 
Credits: Remint32 (idea); sk7725 (korean i18n); Volas171 (spanish i18n).
 2020-12-24 16:05:41 -05:00
Anuken
1e8621d9d4 Merge remote-tracking branch 'origin/master' 2020-12-24 11:43:08 -05:00
Anuken
0940abe98c Fixed #4108 2020-12-24 11:43:04 -05:00
younggam
4a71564d03
mod version check fix (#4100) 
* Update Version.java

* Update contributors
 2020-12-24 10:36:55 -05:00
Patrick 'Quezler' Mounier
9397bd57c4
Prevents plastanium conveyor unload exploit (#4098) 
* Prevent unloaders from unloading plast loading dock

* Use overridable boolean method unloadable instead

* unloadable -> canUnload
 2020-12-24 10:33:40 -05:00