Commit Graph
6154 Commits
Author SHA1 Message Date
Anuken c4c19a204f Bugfixes 2019-11-19 23:09:35 -05:00
Anuken 496677725e Use the sane maven plugin 2019-11-19 22:32:59 -05:00
Anuken a6523c670f Merge remote-tracking branch 'origin/master' 2019-11-19 22:04:15 -05:00
Anuken 879f90ebf4 Added changelogs / Updated link registry 2019-11-19 22:04:10 -05:00
Ali-C-IlaandAnuken ff2d9c34fd Update bundle_zh_TW.properties (#1097) v100 2019-11-19 19:55:57 -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
Prosta4okuaandAnuken 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' MounierandAnuken d03ec3122c Add toggle_power_lines entry to the bundle (#1099) 2019-11-19 12:45:27 -05:00
Patrick 'Quezler' MounierandAnuken 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' MounierandAnuken 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' MounierandAnuken 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
Prosta4okuaandGitHub 9ff53dd87d Update bundle_ru.properties 2019-11-19 13:50:41 +02:00
Prosta4okuaandGitHub 4487d01a38 Update bundle_ru.properties 2019-11-19 13:41:31 +02:00
Anuken fd6c6b2aab Merge remote-tracking branch 'origin/master' 2019-11-19 03:23:58 -05:00
Anuken 44fdda09c6 it's 3 am and ios file imports are finally fixed 2019-11-19 03:23:40 -05:00
ArkanicandAnuken 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
AnukenandGitHub 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
YFdyh000andAnuken 3a3548dd63 Update bundle_zh_CN.properties (#1081) 2019-11-18 17:30:56 -05:00
Ali-C-IlaandAnuken 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' MounierandAnuken 7830372477 Beep boop add f-droid (#1087)
Full credit to @ZacBytes for the initial implementation.
2019-11-18 15:52:44 -05:00
AnukenandGitHub 425f63c673 Update Blocks.java 2019-11-18 12:43:04 -05:00
AnukenandGitHub 7523f20d85 Update BuildVisibility.java 2019-11-18 12:40:03 -05:00
Anuken 13cc136fe2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	CONTRIBUTING.md
2019-11-18 08:30:25 -05:00
Anuken c41cbc8bea Added formatting file 2019-11-18 08:29:52 -05:00
AnukenandGitHub d232d249e9 Update CONTRIBUTING.md 2019-11-18 01:07:26 -05:00
Anuken e0a52f4779 More guidelines 2019-11-18 01:04:37 -05:00
Anuken 8d431e5b40 Contribution guide cleanup 2019-11-18 01:00:16 -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-IlaandAnuken 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
ClauskemandAnuken 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 73b6cc73ff Fixed tests 2019-11-17 11:30:03 -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