Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,700 Commits 4 Branches 180 Tags
v134
Commit Graph
12700 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AnukenandGitHub 230428f2e0 Update CoreBlock.java 2019-11-14 12:35:59 -05:00
AnukenandGitHub 1a26a1bf63 Update CoreBlock.java 2019-11-14 12:28:35 -05:00
AnukenandGitHub 77001324e9 Update EventType.java 2019-11-14 09:59:33 -05:00
Anuken 0fd6207689 Cleanup 2019-11-14 08:51:12 -05:00
Anuken dd175747ab Permissive extensions 2019-11-13 19:40:03 -05:00
Anuken 3106389f6a Switched to HJson content parsing 2019-11-13 19:12:12 -05:00
Anuken d8c997b355 Methods renamed / Better build request handling 2019-11-12 23:40:45 -05:00
Anuken e6647484bd Prototyping mechs 2019-11-12 23:01:10 -05:00
Anuken 4b70b2fbcc Cleanup & refactor of projectors 2019-11-12 17:18:27 -05:00
Anuken 103f655fa4 Removed boolean usage 2019-11-12 15:59:44 -05:00
Anuken 1dfaf3897c Proper node intersect 2019-11-12 08:23:23 -05:00
VanguardandGitHub f7bdd4efe1 Update bundle_ru.properties 2019-11-12 15:21:37 +03:00
Patrick 'Quezler' Mounier 8a089ba3c9 Resolve conflicts 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
 2019-11-12 08:44:26 +01:00
Anuken 56917483d6 Cleaned up diode 2019-11-11 23:32:49 -05:00
Patrick 'Quezler' MounierandAnuken f5c1eb74af 🔩 Add (plastanium) diode (#964) 
* Add plastanium diode

* Only rotate the arrow part

* Use the sum of graph batteries from both sides

* Make diode send power overflow

Diode keeps one-way equalizing while the sending graph has batteries that are ¬ yet fully filled.

* Remove redundant block != null check

* Remove free power

* Stash

* Revert "Stash"

This reverts commit 0c14854519.

* Equalize graph storage percentage

* Update sprite

* Move nearby link check

* DRY

* Fire deathstar at extra spaces

* 〃

* Fix ghost rotation

* Please overlord anuke

* Mild cleanup

* Konami code

* 〃

* Lowercase float

* Newline begone

* Fix overclocking issue

* Fix rotation and name
 2019-11-11 23:29:03 -05:00
Anuken 7d9963d542 Merge 2019-11-11 19:09:37 -05:00
VanguardandGitHub 785afaa281 Update bundle_ru.properties 2019-11-12 00:29:46 +03:00
Joshua FanandAnuken dcdec7f55f Add mouse-based movement (#1037) 
* Add mouse-based movement

* Rename keybind to 'Follow Mouse'
 2019-11-11 14:00:35 -05:00
itskattandAnuken 8d19c8b7af Update overflow gate description (#1040) 2019-11-11 14:00:06 -05:00
VanguardandGitHub 29025a45e8 Update bundle_ru.properties 2019-11-11 18:25:22 +03:00
Anuken a73491bb9b aaaa 2019-11-10 23:28:53 -05:00
Anuken eee06da6b4 again 2019-11-10 23:10:44 -05:00
Anuken 231ce28f74 apple why 2019-11-10 23:01:19 -05:00
Anuken 0e8abca5d9 More attempts 2019-11-10 22:41:06 -05:00
Anuken 2cf628305a Return -1 when applicable 2019-11-10 22:12:25 -05:00
Anuken 001294a94c Use different streams 2019-11-10 21:44:11 -05:00
Anuken fa0e9727ae Remove stream read 2019-11-10 21:28:11 -05:00
Anuken b8aa3c8b21 Attempt 2 2019-11-10 21:16:51 -05:00
Anuken f2f5fde3a5 Merge remote-tracking branch 'origin/master' 2019-11-10 20:59:28 -05:00
Anuken d6822c9c7d Possible IOS read fix 2019-11-10 20:59:23 -05:00
Anuken 52f592a357 Lighting improvements 2019-11-10 16:18:47 -05:00
Anuken 39a0dde1f4 Merge branch 'master' of https://github.com/Anuken/Mindustry into lights 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
 2019-11-10 14:12:43 -05:00
Anuken 8952dd7f56 Begin work on 6.0 2019-11-10 14:05:29 -05:00
iczeroandAnuken fbb1f012e2 Add item and amount properties to DepositEvent (#1025) 2019-11-10 10:15:52 -05:00
Patrick 'Quezler' Mounier 6141b135fe Fix style 2019-11-10 09:25:23 +01:00
Patrick 'Quezler' Mounier e827bb17e7 Move blend check to autotiler 2019-11-10 09:24:24 +01:00
Anuken 4c0607aba8 Bugfixes 2019-11-09 17:19:29 -05:00
Anuken 2af13a31dc Bugfixes 2019-11-09 16:36:28 -05:00