Cristiano Magro
2021-09-03 6194cf7610bbdc63ec635522ed81f0b1d798785e
refs
author Cristiano Magro <cristiano.magro@vola.it>
Friday, September 3, 2021 15:27 +0200
committer Cristiano Magro <cristiano.magro@vola.it>
Friday, September 3, 2021 15:27 +0200
commit6194cf7610bbdc63ec635522ed81f0b1d798785e
tree 29a3292f60246dcfc68175013f139126c7484929 tree | zip | gz
parent a71f00e9f88efd2b041a4fd097b105f4ad26eda1 view | diff
1c219487d3f4dd03c01ff9aa1f298c7c18c7e189 view | diff
Merge branch 'master' into xno_tree_trap
1 files deleted
1 files added
7 files modified
139 ■■■■ changed files
.luacheckrc 2 ●●●●● diff | view | raw | blame | history
technic/crafts.lua 23 ●●●●● diff | view | raw | blame | history
technic/depends.txt 14 ●●●●● diff | view | raw | blame | history
technic/items.lua 5 ●●●●● diff | view | raw | blame | history
technic/machines/HV/nuclear_reactor.lua 40 ●●●●● diff | view | raw | blame | history
technic/machines/other/injector.lua 6 ●●●●● diff | view | raw | blame | history
technic/machines/register/recipes.lua 47 ●●●● diff | view | raw | blame | history
technic/mod.conf 2 ●●● diff | view | raw | blame | history
technic/textures/technic_rubber_goo.png diff | view | raw | blame | history