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
083f2e38d4
Update BuilderTrait.java
2019-11-16 09:37:09 -05:00
Zachary
7feed8828c
Increase time taken for reactor to explode ( #1067 )
...
yes
2019-11-16 00:16:09 -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
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 Wardin
43fe6be13e
Display the server status on gameover (map, players, wave, etc) ( #1068 )
2019-11-15 19:37:26 -05:00
ghostslayer989
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
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' Mounier
836e72119c
🗜 Pressure conduit ( #949 )
...
* Suggest pressure conduit
* Revert "Suggest pressure conduit"
This reverts commit 721dd9255e
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
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
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
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
