mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 03:20:32 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,316 Commits 4 Branches 160 Tags 2.3 GiB
6bc98bbe67
Commit Graph

5316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Anuken
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-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
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
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
b795d97d0e Merge remote-tracking branch 'origin/master' 2019-11-15 19:49:48 -05:00
Anuken
ec7379cc86 Updated to gradle 6.0 2019-11-15 19:48:26 -05:00
Richard Wardin
43fe6be13e Display the server status on gameover (map, players, wave, etc) (#1068) 2019-11-15 19:37:26 -05:00
ghostslayer989
75d4b5b663 Bump gradle from 3.4.1 to 3.5.2 (#1071) 
Bumps gradle from 3.4.1 to 3.5.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-15 19:17:44 -05:00
Anuken
016823d446 Bridge cleanup 2019-11-14 18:53:24 -05:00
Anuken
0cf9ef66fa Merge remote-tracking branch 'origin/master' 2019-11-14 18:48:21 -05:00
Anuken
1f583dc7a2 Bugfixes 2019-11-14 18:48:12 -05:00
Patrick 'Quezler' Mounier
74212771dc
Might as well add a tech tree entry 2019-11-14 21:36:58 +01:00
Patrick 'Quezler' Mounier
6bcea7af66
Pressurize identically as the pulse conduit 2019-11-14 21:33:36 +01:00
Patrick 'Quezler' Mounier
3ec7e40213
Merge branch 'master' into armored-conduit 2019-11-14 21:32:15 +01:00
Patrick 'Quezler' Mounier
836e72119c 🗜 Pressure conduit (#949) 
* Suggest pressure conduit

* Revert "Suggest pressure conduit"

This reverts commit 721dd9255e.

* Increase pulse conduit output pressure

* Remove `tile.block().`
 2019-11-14 15:21:29 -05:00
Maximilian
f81f7e1d2a update DE translation (#914) 2019-11-14 15:11:51 -05:00
Anuken
618a050414 Fix getProgressIncrease 2019-11-14 15:02:09 -05:00