Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,688 Commits 4 Branches 180 Tags
v113.1
Commit Graph
9688 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 0c0573a7b1 Filter fixes 2019-11-16 13:07:40 -05:00
Anuken aa6229be4b Fixed spawn/core select filters 2019-11-16 13:04:04 -05:00
Anuken 94cf054312 Fixed unit tests 2019-11-16 12:40:26 -05:00
Anuken edfe58cb38 Refactoring of tile storage, filters 2019-11-16 12:34:29 -05:00
AnukenandGitHub 083f2e38d4 Update BuilderTrait.java 2019-11-16 09:37:09 -05:00
ZacharyandAnuken 7feed8828c Increase time taken for reactor to explode (#1067) 
yes
 2019-11-16 00:16:09 -05:00
Anuken 8798fa101a Merge 2019-11-16 00:15:45 -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
Fayti1703andAnuken 76c63443af Deduplicate requirements assignment for Tar Fields (#1065) 2019-11-15 20:02:27 -05:00
Joshua FanandAnuken 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 WardinandAnuken 43fe6be13e Display the server status on gameover (map, players, wave, etc) (#1068) 2019-11-15 19:37:26 -05:00
ghostslayer989andAnuken 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
VanguardandGitHub a7fc1a42ce Update bundle_ru.properties 2019-11-15 10:02:08 +03:00
VanguardandGitHub 16eef2dd92 Update bundle_ru.properties 2019-11-15 09:30:30 +03: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' MounierandAnuken 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
MaximilianandAnuken 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
Anuken ec7f49c94b Merge remote-tracking branch 'origin/master' 2019-11-14 14:59:10 -05:00
Anuken 30ea285ca0 Change power "satisfaction" -> "status", use efficiency() in blocks 2019-11-14 14:59:04 -05:00
Prosta4okuaandAnuken 32a5c7b769 Ukrainian translation. You probably forgot about it, right? I remind:) (#1016) 
* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* Update bundle_uk_UA.properties
 2019-11-14 14:44:28 -05:00
Ali-C-IlaandAnuken 581749a29f Update bundle_zh_TW.propertie (#1060) 
* Update bundle_zh_TW.propertie

diode update

* Update bundle_zh_TW.properties
 2019-11-14 14:43:42 -05:00
Adam WitkowskiandAnuken d83d26598c Update bundle_pl.properties (#1041) 
Added missing properties for Polish bundle, improved most of the embarrassing translations and modified a few awkward ones.
 2019-11-14 14:42:15 -05:00
ElerandAnuken d653f1441d Update bundle_pt_BR.properties (#1051) 
HUGE PORTUGUESE UPDATE
Changelog in English (em português logo abaixo)
•99% translated to Portuguese
•Minor correction of translation errors
•Added caps lock on unique items like Workshop and Copper(i will speak why this soon)
•Set the word Wall (house) to Wall (Wall), in Portuguese Wall has two meanings, I put the closest meaning

Changelog em Português
•99% Traduzido para o Português
•Pequena correção nos erros de tradução
•Correção nos erros do menu /n (finalmente!!!)
•Caps Lock adicionado no meio de frase para itens únicos como Oficina e Cobre(Explicarei o porquê em breve)
• Ajuste nas palavras Parede para Muro, pois a segunda tem mais sentido com o objetivo da construção, ex: Muros do Castelo
 2019-11-14 14:41:32 -05:00
Joshua FanandAnuken a9b822089f Make Esc mirror back button behavior in settings (#1061) 2019-11-14 14:41:15 -05:00
Anuken c5a4d7331f Switched to using core attack events 2019-11-14 14:40:42 -05:00