Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,232 Commits 4 Branches 180 Tags
2990013b8e4e2e186025d28329c8c7244bf0a57c
Commit Graph

6187 Commits

Author SHA1 Message Date
Anuken
fe9df51721 Upgraded to 'implementation' / 'api' 2020-05-12 12:31:09 -04:00
Anuken
0663d8067a Merge remote-tracking branch 'origin/master' 2020-05-12 09:41:12 -04:00
Anuken
27ffefa0cd Added sprites 2020-05-12 09:41:07 -04:00
zethnest
3c4c046e1f align opacity check with ItemBridge (#2036) 
* align opacity check with ItemBridge

* align opacity check with ItemBridge
 2020-05-12 09:38:27 -04:00
Anuken
f6d8658ee2 Fixed #2040 / Fixed #2039 / Fixed #2038 / Fixed #2037 / Fixed #2035 2020-05-12 09:34:26 -04:00
Anuken
7f3f1d7d76 Merge remote-tracking branch 'origin/master' 2020-05-11 23:40:34 -04:00
Anuken
43642ff546 Bugfixes / Cleanup 2020-05-11 23:40:23 -04:00
sk7725
911424b2e2 Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Anuken
8e50228df2 Merge remote-tracking branch 'origin/master' 2020-05-11 13:20:38 -04:00
Anuken
9cca79adaa Fixed #2032 2020-05-11 13:20:27 -04:00
Lapis
130eee35ec Update bundle_ja.properties (#2029) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix
 2020-05-11 10:46:34 -04:00
Anuken
03d0849538 Merge remote-tracking branch 'origin/master' 2020-05-11 00:41:39 -04:00
Anuken
3ea2360290 Removal of unused assets/classes 2020-05-11 00:41:35 -04:00
TheMainOne
a5b235d829 Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec Update bundle_ja.properties (#2026) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties
 2020-05-10 22:48:14 -04:00
Anuken
a344c1a5d0 Better sun 2020-05-10 19:17:08 -04:00
Anuken
686c451ea6 Minor tweaks 2020-05-10 17:22:13 -04:00
Anuken
c7d2be5a7f Selection tweaks 2020-05-10 13:58:04 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Summet
c62a87e81a Deleting a block in the editor by right-clicking (#2021) 
* Deleting a block in the editor by right-clicking

* Small fix

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

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-05-10 10:44:54 -04:00
Anuken
dabc891791 Cleanup 2020-05-10 10:37:36 -04:00
Anuken
0adc2811bb Bugfixes 2020-05-10 09:14:13 -04:00
Anuken
d6412bf19c Static cleanup 2020-05-09 22:25:19 -04:00
Anuken
fce89d4db5 Fixed #2015 2020-05-09 22:24:13 -04:00
Anuken
1fdd9dd124 Merge remote-tracking branch 'origin/master' 2020-05-09 16:29:07 -04:00
Anuken
f0d2f7b728 "grabage struct" 2020-05-09 16:29:01 -04:00
Lapis
53d60e9cf6 Update bundle_ja.properties (#2013) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo
 2020-05-09 10:21:34 -04:00
Anuken
bc658f9f45 Synced weather 2020-05-08 21:55:40 -04:00
Anuken
95a1d84eb9 Support for weather in rules / Sector weather 2020-05-08 21:51:17 -04:00
Anuken
d7eb365446 Merge remote-tracking branch 'origin/master' 2020-05-08 20:22:16 -04:00
Anuken
8d5cd7b814 Serialization that makes more sense 2020-05-08 20:22:11 -04:00
valtsu41
dcaf0dded5 Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0 Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
Anuken
aab97fefc8 Fixed puddles not appearing / Overdrive tweaks 
- Bridges, routers and junctions can (probably) be overdrived now, untested
 2020-05-08 16:41:59 -04:00
Anuken
bcec6261d1 Added rain, better snow implementation 2020-05-08 16:13:49 -04:00
Anuken
cda3c3743b Merge remote-tracking branch 'origin/master' 2020-05-08 09:30:48 -04:00
Anuken
4f3cf9466e Less water 2020-05-08 09:30:40 -04:00
laohuaji233
e5e325b25b Update bundle_zh_CN.properties (#2007) 2020-05-08 09:20:44 -04:00
MEEP of Faith
739ce75154 Customizable Fragging Angle (#2006) 
* Customizable Fragging Angle

* I did it wrong.

* Undo that last change.

* Anuke told me to make it just forwards

* Thanks Anuke

My inexperience is very evident.
 2020-05-07 21:53:00 -04:00
Anuken
639738754a Removed startup dialog 2020-05-07 21:40:18 -04:00
Anuken
372b1311f7 Merge remote-tracking branch 'origin/master' 2020-05-07 21:37:54 -04:00
Anuken
2b9d618bd2 Implemented various suggestions 
- Pathfinding weighs walls more
- C disables all HUD
- Unloader doesn't store items
- Some bugfixes
 2020-05-07 21:37:41 -04:00
Lapis
1fd22f6d10 Small fix bundle_ja.properties (#1992) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
Anuken
d51a8611c3 Better exception output 2020-05-07 14:33:01 -04:00
Anuken
047652154e Cleanup 2020-05-07 14:08:27 -04:00
Anuken
542555d721 Merge remote-tracking branch 'origin/master' 2020-05-07 14:05:31 -04:00
Anuken
6ea8a0f583 cleanup 2020-05-07 14:04:58 -04:00