mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 01:37:13 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,694 Commits 4 Branches 160 Tags 2.3 GiB
77becf9179
Commit Graph

94 Commits

Author SHA1 Message Date
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken
0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Anuken
7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
Anuken
bf1268bb6e Shooting -> Function category / Dialog cleanup 2020-10-23 10:39:01 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken
aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Anuken
42d7eb4e05 Bugfixes 2020-07-25 19:08:25 -04:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Anuken
69f6154894 Updated bundles 2020-07-23 17:12:55 -04:00
zethnest
2dfa334ba6
Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Anuken
b284d6892a Updated bundles with missing text 2020-03-27 16:13:41 -04:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Anuken
ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
Joshua Fan
988c424e45 Add max connections stat to power nodes (#988) 2019-11-03 13:00:32 -05:00
Anuken
151dca6fb9 Updated bundles 2019-10-22 20:33:52 -04:00
azureblue
b43db6035f Power Lasers Transparency (#778) 
* Render each visible power link only once.

* Set power lasers opacity based on the setting

* Change power laser colors to work better with transparency

* Slightly reducing power laser width

* Change laser color to the original, minor refactoring

* Change power laser opacity setting label

* Add laser opacity setting text to bundles

* Remove "Show Power Lasers" setting as it's redundant (replaced by lasers opacity setting), changing default laser opacity setting to 100%

* Remove "setting.lasers.name" from other bundles
 2019-10-08 19:32:00 -04:00
Anuken
10ddb5f361 Bugfixes / Bundles updated 2019-09-26 15:41:42 -04:00
Anuken
a0016f001c Updated bundles 2019-08-31 13:08:06 -04:00
Anuken
da336ea412 Updated bundle texts 2019-08-23 18:14:27 -04:00
Anuken
5eadd6608d Updated bundles 2019-07-30 10:23:29 -04:00
Anuken
97eb66b0a5 Bundle update 2019-06-08 12:11:32 -04:00
Anuken
f3385e6453 Pruned bundles 2019-04-30 23:34:41 -04:00
Anuken
09a435320a Impact reactor display bugfix 2019-04-04 15:14:45 -04:00
Anuken
148f272500 New rule modifiers 2019-04-04 00:03:19 -04:00
Anuken
3f6aeac33d Cleanup of new graphical options 2019-04-02 17:18:55 -04:00
Anuken
67a12eecad Bugfixes 2019-04-02 15:52:44 -04:00
Anuken
608de34205 Updated bundles 2019-04-01 13:32:49 -04:00
Anuken
b4071f6dcb Merge 2019-03-31 18:24:25 -04:00
Anuken
6b70418861 Cleanup 2019-03-31 18:20:38 -04:00
Anuken
61f6368591 Bundle update 2019-03-28 17:31:22 -04:00
Anuken
71c2c7ad05 More code cleanup 2019-03-24 21:10:59 -04:00
Anuken
bb9573b85a Build cost/speed rules 2019-03-24 18:33:07 -04:00
Anuken
e1f53dfc67 Added bundle entries 2019-03-24 17:58:59 -04:00
Anuken
ab52c65dcf Updated bundles 2019-03-23 11:08:46 -04:00
Anuken
c7d34049fa Crash fix / Input tweak 2019-03-22 00:16:09 -04:00