mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,262 Commits 4 Branches 160 Tags 2.1 GiB
f9ffb78b33
Commit Graph

4497 Commits

Author SHA1 Message Date
Anuken
f9ffb78b33 Added configurable global server rules 2019-11-16 15:51:35 -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
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
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
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
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
Joshua Fan
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
Anuken
230428f2e0
Update CoreBlock.java 2019-11-14 12:35:59 -05:00
Anuken
1a26a1bf63
Update CoreBlock.java 2019-11-14 12:28:35 -05:00
Anuken
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
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
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
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
iczero
fbb1f012e2 Add item and amount properties to DepositEvent (#1025) 2019-11-10 10:15:52 -05:00
Anuken
4c0607aba8 Bugfixes 2019-11-09 17:19:29 -05:00
Anuken
2af13a31dc Bugfixes 2019-11-09 16:36:28 -05:00
Anuken
2dec6af231 Merge remote-tracking branch 'origin/master' 2019-11-09 15:30:12 -05:00
Anuken
c70fb5940f Display document import errors on iOS 2019-11-09 15:30:02 -05:00
danmw3
ee88cd33b1 Allow for toggling the visibility of power line lasers (#1022) 
* Allow for toggling the visibility of power line lasers

Configurable key-bind in controls and obeys the power line opacity setting.

* Last power opacity is saved after being toggled off.

* Moved key-bind into the View category.
 2019-11-09 00:00:02 -05:00
Anuken
fb15c44383 Fix links in a hacky way 2019-11-08 21:11:49 -05:00
Anuken
4f4113d3d1 Merge remote-tracking branch 'origin/master' 2019-11-08 19:09:45 -05:00
Anuken
52355de1c0 use // for comments 2019-11-08 19:08:07 -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
키에르
796241b40a Add TapEvent/TapConfigEvent (#1018) 
* Update EventType.java

* Update InputHandler.java
 2019-11-08 14:58:24 -05:00
Anuken
505f802e20 Use ## for comments, just in case 2019-11-08 14:55:32 -05:00
Anuken
e9f9194f73 Added json comments 2019-11-08 14:40:15 -05:00
Anuken
effd4e959a Power cleanup 2019-11-08 13:04:24 -05:00
Patrick 'Quezler' Mounier
f58eb75639 🐬 Factorio flavoured powerlines (#997) 
* Stash initial prototype

* Fix 〃to connect the chain

* Add comments

* Hook onto convejor pathfinding

* Cleanup remnant discovered via pull request diff

* Toggle placement between diagonal and pathfinding

* Stash questionable prototype

* 〃

* Attempt to rewrite away the skip array

* Revert "Attempt to rewrite away the skip array"

This reverts commit 12753a9b5c.

* Slight cleanup

* Subtract conveyor placement

* Refractor each to for

* Apply @anuke’s coding stype
 2019-11-08 12:28:49 -05:00
Anuken
8b2934c60e
Update ForceProjector.java 2019-11-07 19:05:15 -05:00
Anuken
d05f56c5b1 Cleanup 2019-11-07 17:16:09 -05:00
Anuken
d1196f8e85 Fixed #745 2019-11-07 16:55:26 -05:00