mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,344 Commits 4 Branches 160 Tags 2.1 GiB
879f90ebf4
Commit Graph

4571 Commits

Author SHA1 Message Date
Anuken
879f90ebf4 Added changelogs / Updated link registry 2019-11-19 22:04:10 -05:00
Anuken
8daaea3536 Minor power tweaks 2019-11-19 19:52:15 -05:00
Anuken
cc7aaae52c Fixed inverted sorter chains 2019-11-19 19:16:35 -05:00
Anuken
4ce494cc22 Merge remote-tracking branch 'origin/master' 2019-11-19 19:08:52 -05:00
Anuken
9461d7a360 Hjson unit tests 2019-11-19 19:08:41 -05:00
Prosta4okua
50854a55f0 Pr/10 (#1095) 
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2019-11-19 17:35:37 -05:00
Patrick 'Quezler' Mounier
d03ec3122c Add toggle_power_lines entry to the bundle (#1099) 2019-11-19 12:45:27 -05:00
Patrick 'Quezler' Mounier
dd13c305e7 Make offline force projector use no boost (#1092) 
Mimiced check in the mending & overdrive projector.
 2019-11-19 09:03:42 -05:00
Patrick 'Quezler' Mounier
48911005aa Fix placing a diode on the world border (#1094) 
* Fix placing a diode on the world border

* 〃
 2019-11-19 08:40:44 -05:00
Patrick 'Quezler' Mounier
7955b82b1e Add weave layer to phase 〃 icon (#1091) 
Makes the block more recognizable in the build menu.
 2019-11-19 08:13:43 -05:00
Arkanic
9bfaecf760 slightly reduced cooldown between votekick (#1056) 2019-11-18 20:08:56 -05:00
Anuken
39939f8a51 Merge https://github.com/joshuaptfan/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
#	core/src/io/anuke/mindustry/content/Blocks.java
#	core/src/io/anuke/mindustry/input/Binding.java
 2019-11-18 19:40:45 -05:00
Anuken
7e5c276e7f
Update PlacementFragment.java 2019-11-18 19:21:43 -05:00
Anuken
7e8503cde7 Merge remote-tracking branch 'origin/master' 2019-11-18 18:56:54 -05:00
Anuken
134fea445c Custom map providers / Added next map specification command 2019-11-18 18:56:49 -05:00
YFdyh000
3a3548dd63 Update bundle_zh_CN.properties (#1081) 2019-11-18 17:30:56 -05:00
Ali-C-Ila
0ef27354be Update bundle_zh_TW.properties (#1085) 
plated conduit
 2019-11-18 17:01:02 -05:00
Anuken
ad25cd8074 Illuminator description 2019-11-18 17:00:52 -05:00
Anuken
6bc98bbe67 Configurable lights 2019-11-18 16:58:39 -05:00
Anuken
5e2dd89d3b Entity type cleanup 2019-11-18 16:24:57 -05:00
Patrick 'Quezler' Mounier
7830372477 Beep boop add f-droid (#1087) 
Full credit to @ZacBytes for the initial implementation.
 2019-11-18 15:52:44 -05:00
Anuken
425f63c673
Update Blocks.java 2019-11-18 12:43:04 -05:00
Anuken
7523f20d85
Update BuildVisibility.java 2019-11-18 12:40:03 -05:00
Anuken
dcb1f0b00a Merge remote-tracking branch 'origin/master' 2019-11-18 00:55:49 -05:00
Anuken
9b732017a9 Added contribution guide 2019-11-18 00:55:33 -05:00
Ali-C-Ila
fd94f8f24b Update bundle_zh_TW.properties (#1066) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

Illuminati and nuke donkey!

* Update bundle_zh_TW.properties
 2019-11-17 15:51:52 -05:00
Clauskem
814b7458ec Added some extra translations (#1078) 2019-11-17 15:51:45 -05:00
Anuken
dc1b073882 Revert #961 2019-11-17 15:45:47 -05:00
Anuken
fad6fe9a2a Added armored conduit / Lighting improvements / Moved liquid package 2019-11-17 13:51:36 -05:00
Anuken
c8eee3b825 Made solar panels less efficient in darkness 2019-11-17 11:35:32 -05:00
Anuken
2593e96999 Bugfixes 2019-11-17 11:20:36 -05:00
Anuken
629999a1cd More unit tests / Lighting improvements 2019-11-16 23:45:31 -05:00
Anuken
4d3e268972 Merge branches 'lights' and 'master' of https://github.com/Anuken/Mindustry 2019-11-16 23:29:33 -05:00
Anuken
84968c9f73 Added color picker / Customizable lighting rules 2019-11-16 23:27:42 -05:00
Anuken
d73b99945f Minor light optimization 2019-11-16 22:49:36 -05:00
Anuken
1d15316cbb Configurable ambient light, darkness 2019-11-16 20:18:00 -05:00
Anuken
913a703d41 Illuminator textures 2019-11-16 20:06:11 -05:00
Anuken
5d949f6bc0 Correct reactor consumption display 2019-11-16 20:05:52 -05:00
Anuken
faf64f11f2 More lights 2019-11-16 19:57:33 -05:00
Anuken
430c4fa1d0 Fixed #1077 2019-11-16 16:54:51 -05:00
Anuken
a90f2545d9 Disable reactor explosions on servers by default 2019-11-16 16:43:31 -05:00
Anuken
eba0a96b6d Merge remote-tracking branch 'origin/master' 2019-11-16 15:51:51 -05:00
Anuken
f9ffb78b33 Added configurable global server rules 2019-11-16 15:51:35 -05:00
Anuken
083f2e38d4
Update BuilderTrait.java 2019-11-16 09:37:09 -05:00
Zachary
7feed8828c Increase time taken for reactor to explode (#1067) 
yes
 2019-11-16 00:16:09 -05:00
Anuken
1f6ef9d9ae Merge remote-tracking branch 'origin/master' 2019-11-15 21:12:12 -05:00
Anuken
e6afe584e5 Fixed 'underwater' ores 2019-11-15 21:12:08 -05:00
Fayti1703
76c63443af Deduplicate requirements assignment for Tar Fields (#1065) 2019-11-15 20:02:27 -05:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Anuken
016823d446 Bridge cleanup 2019-11-14 18:53:24 -05:00