mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-02 04:10:43 -07:00
Code Issues Projects Releases Wiki Activity
9277 commits 5 branches 183 tags 2.5 GiB
Commit graph

3704 commits

Author SHA1 Message Date
Vanguard
c82473ba47
Update bundle_ru.properties 2019-11-20 17:42:10 +03:00
Vanguard
b99a0ff618
Merge branch 'master' into master 2019-11-20 17:14:51 +03:00
Vanguard
c7000b29a6
Update bundle_ru.properties 2019-11-20 16:47:55 +03: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-Ila
ff2d9c34fd Update bundle_zh_TW.properties (#1097) 2019-11-19 19:55:57 -05:00
Prosta4okua
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' Mounier
d03ec3122c Add toggle_power_lines entry to the bundle (#1099) 2019-11-19 12:45:27 -05:00
Patrick 'Quezler' Mounier
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
Prosta4okua
9ff53dd87d
Update bundle_ru.properties 2019-11-19 13:50:41 +02:00
Prosta4okua
4487d01a38
Update bundle_ru.properties 2019-11-19 13:41:31 +02: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
YFdyh000
3a3548dd63 Update bundle_zh_CN.properties (#1081) 2019-11-18 17:30:56 -05:00
Ali-C-Ila
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' Mounier
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-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
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
Anuken
8798fa101a Merge 2019-11-16 00:15:45 -05:00
Joshua Fan
cafd95859f Clean up text capitalization, misc UI (#1072) 2019-11-15 20:01:59 -05:00
Vanguard
a7fc1a42ce
Update bundle_ru.properties 2019-11-15 10:02:08 +03:00
Vanguard
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
Maximilian
f81f7e1d2a update DE translation (#914) 2019-11-14 15:11:51 -05:00
Prosta4okua
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-Ila
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 Witkowski
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
Eler
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
Vanguard
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' Mounier
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
Vanguard
785afaa281
Update bundle_ru.properties 2019-11-12 00:29:46 +03:00
Joshua Fan
dcdec7f55f Add mouse-based movement (#1037) 
* Add mouse-based movement

* Rename keybind to 'Follow Mouse'
 2019-11-11 14:00:35 -05:00
itskatt
8d19c8b7af Update overflow gate description (#1040) 2019-11-11 14:00:06 -05:00
Vanguard
29025a45e8
Update bundle_ru.properties 2019-11-11 18:25:22 +03: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
Vanguard
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
iczero
ebee4fa5da Implement build autopausing (#1017) 
Automatically pause building after current build queue is empty
 2019-11-08 16:56:06 -05:00