Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,465 Commits 4 Branches 180 Tags
43762e82a831cf309fbc4daf19cc8a76b6b50e2c
Commit Graph
1835 Commits
Author SHA1 Message Date
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
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
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
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 fad6fe9a2a Added armored conduit / Lighting improvements / Moved liquid package 2019-11-17 13:51:36 -05:00
Anuken 84968c9f73 Added color picker / Customizable lighting rules 2019-11-16 23:27:42 -05:00
Anuken faf64f11f2 More lights 2019-11-16 19:57:33 -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
Joshua FanandAnuken cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -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
Patrick 'Quezler' Mounier 3ec7e40213 Merge branch 'master' into armored-conduit 2019-11-14 21:32:15 +01:00
MaximilianandAnuken f81f7e1d2a update DE translation (#914) 2019-11-14 15:11:51 -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
Anuken 4b70b2fbcc Cleanup & refactor of projectors 2019-11-12 17:18:27 -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
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
VanguardandGitHub 2c15ae178d Update bundle_ru.properties 2019-11-09 16:38:29 +03:00
Joshua Fan 4a987677ac Add 'Show Block Select Keys' graphics option, implement requested changes 2019-11-09 07:59:00 -05:00
iczeroandAnuken ebee4fa5da Implement build autopausing (#1017) 
Automatically pause building after current build queue is empty
 2019-11-08 16:56:06 -05:00
VanguardandGitHub 32e207d047 Update bundle_ru.properties 2019-11-08 16:38:18 +03:00
joshuaptfan 8a6d39d5d0 Revert changes to localization files 2019-11-07 07:20:43 -08:00
VanguardandGitHub 0ac7059812 Update bundle_ru.properties 2019-11-07 00:35:44 +03:00
VanguardandGitHub c9c1c57c9d Update bundle_ru.properties 2019-11-06 07:35:45 +03:00
VanguardandGitHub 01ef9c4fea Update bundle_ru.properties 2019-11-06 05:49:46 +03:00
joshuaptfan dbb64f1d87 Add hotkey tutorial to tutorial mission 2019-11-05 17:25:21 -08:00
Anuken ce6f3ddb5a Updated bundles 2019-11-05 19:03:14 -05:00
12358abcandAnuken d86997e388 Add files via upload (#979) 2019-11-05 18:55:31 -05:00
Ali-C-IlaandAnuken 60717bdaad Update bundle_zh_TW.properties (#972 and #945 included) (#1002) 
This includes the contents in the previous two pull requests.(#945 and #972 )
Also improved another few translations.
 2019-11-05 18:54:15 -05:00
Patrick 'Quezler' MounierandAnuken b2d417f207 Display pump output during placement (#1003) 2019-11-05 17:58:19 -05:00
kirinaandAnuken 4352ab92f1 fix Japanese translation for Mods (#991) 2019-11-05 17:42:28 -05:00
ElerTheMagnanimousandAnuken 5c522069b1 Update bundle_pt_BR.properties (#1007) 
a few more fixes at translation
 2019-11-05 17:39:57 -05:00
Anuken 21b7016fb5 Bugfixes 2019-11-05 15:32:13 -05:00
VanguardandGitHub 4dde48d18e Update bundle_ru.properties 2019-11-05 17:33:04 +03:00
Patrick 'Quezler' Mounier c6a75891d3 Add bundle entry 2019-11-05 14:41:08 +01:00
Anuken 3e43f5577e Bugfixes 2019-11-04 23:47:51 -05:00