Commit Graph

1067 Commits

Author SHA1 Message Date
Thomas Rudin
d260bb0245 Merge pull request #1 from OgelGames/master
Fix conflicting desert sand compress recipes
2019-09-04 12:39:17 +02:00
OgelGames
eac1f71433 Fix conflicting desert sand compress recipes 2019-09-04 19:26:33 +10:00
NatureFreshMilk
264bfef602 Merge branch 'cool_trees' of https://github.com/coil0/technic into pandorabox 2019-08-27 07:35:29 +02:00
NatureFreshMilk
9a48248316 Merge branch 'master' into pandorabox 2019-08-27 07:35:00 +02:00
coil
b7dafca556 Add cool_trees support to the chainsaw 2019-08-26 16:43:02 -04:00
d-stephane
768fbecc64 Add french translation (#417) 2019-08-26 19:53:24 +02:00
Sires
707fa5a97c Fix typos 2019-08-26 19:52:41 +02:00
Sires
505ad8d045 Add translation for wrench mod 2019-08-26 19:52:41 +02:00
Sires
a75cb7252d Add translation for technic_worldgen mod 2019-08-26 19:52:41 +02:00
Sires
662cc7e7ef Add translation for technic_chests mod 2019-08-26 19:52:41 +02:00
Sires
e12220be79 Add translation for technic mod 2019-08-26 19:52:41 +02:00
Sires
19e045e042 Add translation for extranodes mod 2019-08-26 19:52:41 +02:00
Sires
e8e5df3f4a Add translation for concrete mod 2019-08-26 19:52:41 +02:00
coil
d119a67482 Refactor switching station ABMs (#508)
When the function is defined inside the ABM, a new closure is allocated every time the ABM runs. 
Since the action function is already way too long, it's better for readability and performance to split it out.
2019-08-26 19:45:11 +02:00
NatureFreshMilk
372bbea9c0 Merge branch 'radiation-group' of https://github.com/coil0/technic into pandorabox 2019-08-23 07:15:07 +02:00
coil
6a89a9ca83 Fix radiation protection when armor group is not set
The radiation damage group can be not set when armor completely
protects against radiation or when no mod has set a default value
for the damage group. We want to apply radiation damage in the
second case but not in the first.
2019-08-22 17:47:07 -04:00
NatureFreshMilk
62ee9016b7 Merge branch 'master' into pandorabox 2019-08-21 15:45:51 +02:00
Thomas Rudin
185824dcea Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox 2019-08-05 20:12:36 +02:00
Thomas Rudin
68755c0cf7 i really should have a setting for this 2019-08-03 07:23:08 +02:00
coil
06c6df0e21 Apply radiation damage only if entity is not dead (#504)
This prevents on_dieplayer being called unnecessarily, causing problems such as repeated death messages.
2019-07-25 11:27:02 +02:00
coil
bb05ff8fd2 Reject constructor in constructor slot inventories (#505) 2019-07-21 12:40:57 +02:00
Vanessa Dannenberg
d1bf386b80 Use Unified Dyes on_dig where needed (#506)
Requires Unified Dyes commit 9ff40a7f or later
2019-07-21 12:37:56 +02:00
NatureFreshMilk
1a9d4ccc7d Merge branch 'master' into pandorabox 2019-07-16 16:11:27 +02:00
coil
dc4f4f66e6 Apply radiation damage only if entity is not dead (#504)
This prevents on_dieplayer being called unnecessarily, causing problems such as repeated death messages.
2019-07-10 20:27:01 +02:00
Thomas Rudin
439ebfc173 moar depth 2019-07-08 17:44:19 +02:00
Hugo Locurcio
62fdb853ec Optimize PNG images losslessly (#501)
This incorporates non-interlaced PNGs from #500 to fix warnings thrown by libpng.
2019-06-20 18:35:26 +02:00
Thomas Rudin
897538d3fa limit cpu time of the quarry 2019-06-19 14:41:16 +02:00
obl3pplifp
8a987bb361 Add tubelib support to technic chests (#498) 2019-06-09 20:48:52 +02:00
Thomas Rudin
458f23b929 limit quarry depth 2019-06-04 05:56:00 +02:00
Parasitoid
e8f1033d49 Add alloy ice + bucket = water bucket (#470) 2019-06-01 12:33:31 +02:00
Thomas Rudin
ae20567894 Ifix https://github.com/pandorabox-io/pandorabox.io/issues/170 2019-05-20 14:26:48 +02:00
Thomas Rudin
beb30a5603 fix digtron crate corruption 2019-05-12 18:43:12 +02:00
Thomas Rudin
bca3c97229 remove monitoring code 2019-04-29 21:30:17 +02:00
Thomas Rudin
6059ec8aeb Revert "Revert "Revert "remove monitoring code and deps"""
This reverts commit 2a07854bd337e918ea9e60d08b42b7dbe09b2433.
2019-04-29 21:26:20 +02:00
Thomas Rudin
b89eee3b68 sw fix 2019-04-29 20:57:00 +02:00
Thomas Rudin
9ca1f1070a Revert "Revert "remove monitoring code and deps""
This reverts commit 48d251a33821a2b6f9f826e6d8fe7ca601e3e903.
2019-04-29 20:49:22 +02:00
Thomas Rudin
8b457ef770 lift quarry limits a bit 2019-04-20 22:00:04 +02:00
mat9117
a9b10cc4b1 Fix Polish translation (#497) 2019-04-14 11:43:30 +02:00
Lejo
b81d1d3f2d Check protection of the forcefield and Quarry (#468) 2019-04-13 20:45:49 +02:00
Thomas Rudin
5e8c450f0a Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox 2019-04-12 21:03:07 +02:00
Thomas Rudin
3252c4340a cleanup 2019-04-12 15:43:25 +02:00
Thomas Rudin
bf0f22fdb8 don't check above pos on quarry dig 2019-04-12 15:43:03 +02:00
Thomas Rudin
ddf78dbc57 perf stuff 2019-04-10 09:42:02 +02:00
Thomas Rudin
0886117328 try to load_area() on quarry dig 2019-04-09 18:16:27 +02:00
Thomas Rudin
55c343b0a8 Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox 2019-04-01 16:26:54 +02:00
NatureFreshMilk
cea42b18a0 add technic.switch_max_range setting 2019-04-01 09:07:06 +02:00
mat9117
c9ba4b329d Add Polish translation (#493) 2019-03-31 13:00:48 +02:00
Thomas Rudin
dd8455a888 Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox 2019-03-21 14:06:26 +01:00
NatureFreshMilk
0af2749ac4 tune abm intervals to introduce jitter 2019-03-21 13:10:10 +01:00
NatureFreshMilk
e44bf92960 rate limit forcefield rendering (on-case) 2019-03-21 13:07:49 +01:00