Cristiano Magro
2024-08-27 535e04d542520f58a2db8d4d7a222b73e5c96ef1
refs
author Cristiano Magro <cristiano.magro@vola.it>
Tuesday, August 27, 2024 11:42 +0200
committer Cristiano Magro <cristiano.magro@vola.it>
Tuesday, August 27, 2024 11:42 +0200
commit535e04d542520f58a2db8d4d7a222b73e5c96ef1
tree 65fffd8ff1668d371c26f1f3648e3759c81b7ff7 tree | zip | gz
parent 6194cf7610bbdc63ec635522ed81f0b1d798785e view | diff
221fc1376eadbf60b83a9210440ae4b94fe5acf0 view | diff
Merge branch 'master' into xno_tree_trap
21 files added
8 files renamed
48 files modified
106 files deleted
3853 ■■■■■ changed files
.luacheckrc 24 ●●●● diff | view | raw | blame | history
LICENSE.txt 16 ●●●●● diff | view | raw | blame | history
README.md 13 ●●●● diff | view | raw | blame | history
concrete/depends.txt 4 ●●●● diff | view | raw | blame | history
concrete/init.lua 7 ●●●●● diff | view | raw | blame | history
concrete/locale/ja.txt 9 ●●●●● diff | view | raw | blame | history
extranodes/depends.txt 9 ●●●●● diff | view | raw | blame | history
extranodes/init.lua 77 ●●●●● diff | view | raw | blame | history
extranodes/locale/ja.txt 8 ●●●●● diff | view | raw | blame | history
manual.md 465 ●●●●● diff | view | raw | blame | history
modpack.conf 2 ●●●●● diff | view | raw | blame | history
settingtypes.txt 9 ●●●●● diff | view | raw | blame | history
technic/README.md 32 ●●●● diff | view | raw | blame | history
technic/doc/api.md 150 ●●●● diff | view | raw | blame | history
technic/helpers.lua 17 ●●●● diff | view | raw | blame | history
technic/init.lua 18 ●●●● diff | view | raw | blame | history
technic/legacy.lua 37 ●●●●● diff | view | raw | blame | history
technic/machines/HV/forcefield.lua 7 ●●●● diff | view | raw | blame | history
technic/machines/HV/nuclear_reactor.lua 34 ●●●●● diff | view | raw | blame | history
technic/machines/HV/quarry.lua 75 ●●●●● diff | view | raw | blame | history
technic/machines/LV/grinder.lua 20 ●●●●● diff | view | raw | blame | history
technic/machines/LV/init.lua 3 ●●●●● diff | view | raw | blame | history
technic/machines/LV/lamp.lua 156 ●●●●● diff | view | raw | blame | history
technic/machines/LV/led.lua 95 ●●●●● diff | view | raw | blame | history
technic/machines/MV/power_radiator.lua 3 ●●●● diff | view | raw | blame | history
technic/machines/other/anchor.lua 28 ●●●●● diff | view | raw | blame | history
technic/machines/other/frames.lua 28 ●●●● diff | view | raw | blame | history
technic/machines/register/battery_box.lua 82 ●●●●● diff | view | raw | blame | history
technic/machines/register/cables.lua 39 ●●●●● diff | view | raw | blame | history
technic/machines/register/compressor_recipes.lua 110 ●●●● diff | view | raw | blame | history
technic/machines/register/grinder_recipes.lua 161 ●●●●● diff | view | raw | blame | history
technic/machines/supply_converter.lua 42 ●●●● diff | view | raw | blame | history
technic/machines/switching_station.lua 181 ●●●● diff | view | raw | blame | history
technic/mod.conf 2 ●●● diff | view | raw | blame | history
technic/radiation.lua 2 ●●● diff | view | raw | blame | history
technic/register.lua 5 ●●●● diff | view | raw | blame | history
technic/textures/hires/technic_hv_nuclear_reactor_core_128.png diff | view | raw | blame | history
technic/textures/hires/technic_hv_nuclear_reactor_core_16.png diff | view | raw | blame | history
technic/textures/hires/technic_hv_nuclear_reactor_core_256.png diff | view | raw | blame | history
technic/textures/hires/technic_hv_nuclear_reactor_core_32.png diff | view | raw | blame | history
technic/textures/hires/technic_hv_nuclear_reactor_core_64.png diff | view | raw | blame | history
technic/textures/power_meter.png diff | view | raw | blame | history
technic/textures/technic_copper_coil.png diff | view | raw | blame | history
technic/textures/technic_deployer_back.png diff | view | raw | blame | history
technic/textures/technic_deployer_bottom.png diff | view | raw | blame | history
technic/textures/technic_deployer_front_off.png diff | view | raw | blame | history
technic/textures/technic_deployer_front_on.png diff | view | raw | blame | history
technic/textures/technic_deployer_side.png diff | view | raw | blame | history
technic/textures/technic_deployer_side1.png diff | view | raw | blame | history
technic/textures/technic_deployer_side2.png diff | view | raw | blame | history
technic/textures/technic_deployer_top.png diff | view | raw | blame | history
technic/textures/technic_generator_front.png diff | view | raw | blame | history
technic/textures/technic_generator_front_active.png diff | view | raw | blame | history
technic/textures/technic_generator_side.png diff | view | raw | blame | history
technic/textures/technic_generator_top.png diff | view | raw | blame | history
technic/textures/technic_injector_side.png diff | view | raw | blame | history
technic/textures/technic_injector_top.png diff | view | raw | blame | history
technic/textures/technic_lv_lamp_bottom.png diff | view | raw | blame | history
technic/textures/technic_lv_lamp_side.png diff | view | raw | blame | history
technic/textures/technic_lv_lamp_top.png diff | view | raw | blame | history
technic/textures/technic_lv_led.png diff | view | raw | blame | history
technic/textures/technic_lv_led_inv.png diff | view | raw | blame | history
technic/textures/technic_lv_led_side.png diff | view | raw | blame | history
technic/textures/technic_lv_led_side2.png diff | view | raw | blame | history
technic/textures/technic_lv_led_top.png diff | view | raw | blame | history
technic/textures/technic_music_player_top.png diff | view | raw | blame | history
technic/textures/technic_nether_dust.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_back.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_bottom.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_bottom_off.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_bottom_on.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_front_off.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_front_on.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side1.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side1_off.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side1_on.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side2.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side2_off.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_side2_on.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_top.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_top_off.png diff | view | raw | blame | history
technic/textures/technic_nodebreaker_top_on.png diff | view | raw | blame | history
technic/textures/technic_power_meter_bg.png diff | view | raw | blame | history
technic/textures/technic_power_meter_fg.png diff | view | raw | blame | history
technic/textures/technic_pyrite_dust.png diff | view | raw | blame | history
technic/textures/technic_river_water_can.png diff | view | raw | blame | history
technic/textures/technic_rubber_goo.png diff | view | raw | blame | history
technic/textures/technic_screwdriver.png diff | view | raw | blame | history
technic/textures/technicx32/technic_battery.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_back.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_bottom.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_front_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_front_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_side.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_side1.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_side2.png diff | view | raw | blame | history
technic/textures/technicx32/technic_deployer_top.png diff | view | raw | blame | history
technic/textures/technicx32/technic_fine_copper_wire.png diff | view | raw | blame | history
technic/textures/technicx32/technic_fine_gold_wire.png diff | view | raw | blame | history
technic/textures/technicx32/technic_fine_silver_wire.png diff | view | raw | blame | history
technic/textures/technicx32/technic_geothermal_side.png diff | view | raw | blame | history
technic/textures/technicx32/technic_geothermal_top.png diff | view | raw | blame | history
technic/textures/technicx32/technic_geothermal_top_active.png diff | view | raw | blame | history
technic/textures/technicx32/technic_grinder_front.png diff | view | raw | blame | history
technic/textures/technicx32/technic_grinder_side.png diff | view | raw | blame | history
technic/textures/technicx32/technic_grinder_top.png diff | view | raw | blame | history
technic/textures/technicx32/technic_laser_beam.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_back.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_bottom.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_bottom_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_bottom_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_front_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_front_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side1.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side1_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side1_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side2.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side2_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_side2_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_top.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_top_off.png diff | view | raw | blame | history
technic/textures/technicx32/technic_nodebreaker_top_on.png diff | view | raw | blame | history
technic/textures/technicx32/technic_pyrite_dust.png diff | view | raw | blame | history
technic/textures/technicx32/technic_rubber.png diff | view | raw | blame | history
technic/textures/technicx32/technic_rubber_sapling.png diff | view | raw | blame | history
technic/textures/technicx32/technic_rubber_tree_empty.png diff | view | raw | blame | history
technic/textures/technicx32/technic_rubber_tree_full.png diff | view | raw | blame | history
technic/textures/technicx32/technic_silicon_wafer.png diff | view | raw | blame | history
technic/tools/cans.lua 31 ●●●● diff | view | raw | blame | history
technic/tools/chainsaw.lua 573 ●●●●● diff | view | raw | blame | history
technic/tools/flashlight.lua 11 ●●●● diff | view | raw | blame | history
technic/tools/mining_drill.lua 184 ●●●●● diff | view | raw | blame | history
technic/tools/mining_lasers.lua 15 ●●●● diff | view | raw | blame | history
technic/tools/prospector.lua 73 ●●●●● diff | view | raw | blame | history
technic/tools/sonic_screwdriver.lua 11 ●●●● diff | view | raw | blame | history
technic/tools/vacuum.lua 23 ●●●● diff | view | raw | blame | history
technic_chests/common.lua 4 ●●●● diff | view | raw | blame | history
technic_chests/depends.txt 7 ●●●●● diff | view | raw | blame | history
technic_chests/locale/ja.txt 41 ●●●●● diff | view | raw | blame | history
technic_chests/register.lua 120 ●●●●● diff | view | raw | blame | history
technic_chests/textures/technic_chest_form_bg.png diff | view | raw | blame | history
technic_chests/textures/technic_copper_chest_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_form_bg.png diff | view | raw | blame | history
technic_chests/textures/technic_gold_chest_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_iron_chest_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_main_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_mithril_chest_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_silver_chest_inventory.png diff | view | raw | blame | history
technic_chests/textures/technic_wooden_chest_inventory.png diff | view | raw | blame | history
technic_cnc/cnc.lua 157 ●●●● diff | view | raw | blame | history
technic_cnc/cnc_api.lua 157 ●●●●● diff | view | raw | blame | history
technic_cnc/cnc_materials.lua 173 ●●●●● diff | view | raw | blame | history
technic_cnc/depends.txt 3 ●●●●● diff | view | raw | blame | history
technic_cnc/init.lua 6 ●●●● diff | view | raw | blame | history
technic_cnc/locale/de.txt 36 ●●●●● diff | view | raw | blame | history
technic_cnc/locale/technic_cnc.de.tr 50 ●●●●● diff | view | raw | blame | history
technic_cnc/locale/template.txt 84 ●●●●● diff | view | raw | blame | history
technic_cnc/textures/technic_cnc_slope_edge_upsdown.png diff | view | raw | blame | history
technic_cnc/textures/technic_cnc_slope_inner_edge_upsdown.png diff | view | raw | blame | history
technic_cnc/textures/technic_cnc_slope_upsdown.png diff | view | raw | blame | history
technic_worldgen/depends.txt 9 ●●●●● diff | view | raw | blame | history
technic_worldgen/nodes.lua 18 ●●●●● diff | view | raw | blame | history
technic_worldgen/textures/technic_granite_bricks.png diff | view | raw | blame | history
technic_worldgen/textures/technic_stainless_steel_ingot.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_brass_ingot.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_chromium_ingot.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_chromium_lump.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_concrete_block.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_granite.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_marble.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_marble_bricks.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_mineral_chromium.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_mineral_uranium.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_mineral_zinc.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_rebar.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_uranium.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_zinc_ingot.png diff | view | raw | blame | history
technic_worldgen/textures/x32/technic_zinc_lump.png diff | view | raw | blame | history
wrench/depends.txt 6 ●●●●● diff | view | raw | blame | history
wrench/init.lua 85 ●●●●● diff | view | raw | blame | history
wrench/locale/ja.txt 6 ●●●●● diff | view | raw | blame | history