modmuss50
|
e1d1ab8c08
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-08-02 18:43:25 +01:00 |
|
modmuss50
|
ffb770f64f
|
Rework the auto crafter to not use the recipe book, will fix it being impossible to use in some mod packs like continuum for example.
|
2018-08-02 18:42:58 +01:00 |
|
drcrazy
|
d03b0edbd7
|
Max energy for matter fabricator is 10M EU \ 40M FE
|
2018-08-02 18:06:43 +03:00 |
|
modmuss50
|
16293571a2
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-07-30 19:42:28 +01:00 |
|
modmuss50
|
3d9b81a6b0
|
Fix possible dupe bug, and allow better support for larger item stack sizes
|
2018-07-30 19:42:08 +01:00 |
|
drcrazy
|
a75a493de7
|
Added blaze dust and HOP graphite dust recipes.
|
2018-07-30 13:07:50 +03:00 |
|
drcrazy
|
a6f242e7e6
|
Overriden setContainerToEmpty. I thought this was already in GH.
|
2018-07-30 11:48:39 +03:00 |
|
ImgBotApp
|
2a0d737c92
|
[ImgBot] optimizes images
/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png -- 0.44kb -> 0.43kb (3.1%)
|
2018-07-28 18:42:24 +00:00 |
|
ImgBotApp
|
3dd8a18868
|
[ImgBot] optimizes images
*Total -- 420.59kb -> 198.23kb (52.87%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_glow.png -- 14.67kb -> 0.34kb (97.68%)
/src/main/resources/assets/techreborn/textures/items/nugget/iridium_nugget.png -- 14.25kb -> 0.37kb (97.42%)
/src/main/resources/assets/techreborn/textures/blocks/ore/iridium_ore.png -- 14.39kb -> 0.44kb (96.95%)
/src/main/resources/assets/techreborn/textures/items/plate/iridium_plate.png -- 14.37kb -> 0.44kb (96.91%)
/src/main/resources/assets/techreborn/textures/items/ingot/iridium_ingot.png -- 14.36kb -> 0.44kb (96.9%)
/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_off.png -- 15.23kb -> 0.67kb (95.61%)
/src/main/resources/assets/techreborn/textures/blocks/machines/lighting/alarm_on.png -- 15.46kb -> 0.81kb (94.76%)
/src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png -- 15.51kb -> 0.96kb (93.82%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/creative_panel_side.png -- 17.11kb -> 1.24kb (92.76%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/creative_panel_top.png -- 15.22kb -> 1.12kb (92.64%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_sctm.png -- 3.45kb -> 0.67kb (80.55%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass_ctm.png -- 3.42kb -> 0.69kb (79.93%)
/src/main/resources/assets/techreborn/textures/items/cables/tin.png -- 1.21kb -> 0.36kb (70.26%)
/src/main/resources/assets/techreborn/textures/blocks/cables/tin_cable.png -- 1.28kb -> 0.41kb (68.24%)
/src/main/resources/assets/techreborn/textures/items/cables/hv.png -- 1.21kb -> 0.39kb (67.83%)
/src/main/resources/assets/techreborn/textures/items/cables/copper.png -- 1.21kb -> 0.40kb (67.04%)
/src/main/resources/assets/techreborn/textures/items/cables/gold.png -- 1.21kb -> 0.40kb (67.04%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedcopper.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedgold.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/items/cables/insulatedhv.png -- 1.22kb -> 0.45kb (63.61%)
/src/main/resources/assets/techreborn/textures/gui/destructopack.png -- 1.80kb -> 0.66kb (63.54%)
/src/main/resources/assets/techreborn/textures/items/cables/glassfiber.png -- 1.23kb -> 0.45kb (63.14%)
/src/main/resources/assets/techreborn/textures/blocks/cables/glass_fiber_cable.png -- 1.26kb -> 0.48kb (61.93%)
/src/main/resources/assets/techreborn/textures/blocks/cables/hv_cable.png -- 1.26kb -> 0.49kb (61.47%)
/src/main/resources/assets/techreborn/textures/blocks/cables/copper_cable.png -- 1.26kb -> 0.51kb (59.92%)
/src/main/resources/assets/techreborn/textures/blocks/cables/gold_cable.png -- 1.27kb -> 0.51kb (59.72%)
/src/main/resources/assets/techreborn/textures/blocks/cables/hv_insulated_cable.png -- 1.28kb -> 0.52kb (59.28%)
/src/main/resources/assets/techreborn/textures/blocks/cables/copper_insulated_cable.png -- 1.28kb -> 0.52kb (59.05%)
/src/main/resources/assets/techreborn/textures/blocks/cables/gold_insulated_cable.png -- 1.28kb -> 0.52kb (59.05%)
/src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png -- 2.18kb -> 0.90kb (58.89%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png -- 4.22kb -> 1.83kb (56.53%)
/src/main/resources/assets/techreborn/textures/gui/chargebench.png -- 2.21kb -> 1.05kb (52.6%)
/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png -- 1.85kb -> 0.88kb (52.48%)
/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png -- 1.89kb -> 0.93kb (50.7%)
/src/main/resources/assets/techreborn/textures/gui/rollingmachine.png -- 1.89kb -> 0.93kb (50.7%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png -- 3.78kb -> 1.87kb (50.54%)
/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png -- 1.89kb -> 0.94kb (50%)
/src/main/resources/assets/techreborn/textures/gui/thermal_generator.png -- 1.89kb -> 0.94kb (50%)
/src/main/resources/assets/techreborn/textures/gui/compressor.png -- 2.54kb -> 1.36kb (46.55%)
/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png -- 2.57kb -> 1.38kb (46.28%)
/src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png -- 2.73kb -> 1.48kb (45.78%)
/src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png -- 2.74kb -> 1.51kb (44.88%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/wolframium_flowing.png -- 5.81kb -> 3.23kb (44.49%)
/src/main/resources/assets/techreborn/textures/gui/gas_generator.png -- 2.35kb -> 1.34kb (43.02%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier3_machines/mass_fabricator_side_on.png -- 3.38kb -> 1.92kb (42.99%)
/src/main/resources/assets/techreborn/textures/gui/jei_fluid_generator.png -- 2.29kb -> 1.32kb (42.47%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png -- 2.38kb -> 1.39kb (41.49%)
/src/main/resources/assets/techreborn/textures/gui/generator.png -- 2.48kb -> 1.46kb (41.06%)
/src/main/resources/assets/techreborn/textures/gui/fusion_reactor.png -- 1.91kb -> 1.16kb (39.32%)
/src/main/resources/assets/techreborn/textures/gui/jei.png -- 1.56kb -> 1.01kb (35.13%)
/src/main/resources/assets/techreborn/textures/gui/matterfabricator.png -- 1.42kb -> 0.93kb (34.57%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridum_reinforced_stone_ctm.png -- 2.10kb -> 1.40kb (33.19%)
/src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png -- 1.50kb -> 1.00kb (32.9%)
/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png -- 1.50kb -> 1.01kb (32.81%)
/src/main/resources/assets/techreborn/textures/gui/distillation_tower.png -- 1.49kb -> 1.00kb (32.81%)
/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png -- 1.51kb -> 1.01kb (32.75%)
/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png -- 1.51kb -> 1.02kb (32.39%)
/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png -- 1.53kb -> 1.03kb (32.35%)
/src/main/resources/assets/techreborn/textures/gui/grinder.png -- 1.56kb -> 1.07kb (31.64%)
/src/main/resources/assets/techreborn/textures/blocks/rubber_leaves.png -- 0.87kb -> 0.60kb (31.13%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_top_on.png -- 5.24kb -> 3.65kb (30.33%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_front_on.png -- 2.44kb -> 1.76kb (27.96%)
/src/main/resources/assets/techreborn/textures/gui/lathe.png -- 1.75kb -> 1.27kb (27.51%)
/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png -- 4.14kb -> 3.00kb (27.41%)
/src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png -- 1.77kb -> 1.29kb (27.22%)
/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png -- 1.79kb -> 1.32kb (26.63%)
/src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png -- 1.80kb -> 1.32kb (26.44%)
/src/main/resources/logo.png -- 37.62kb -> 27.76kb (26.21%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png -- 2.75kb -> 2.05kb (25.67%)
/src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png -- 1.85kb -> 1.38kb (25.51%)
/src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png -- 1.91kb -> 1.42kb (25.22%)
/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png -- 18.15kb -> 13.64kb (24.85%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png -- 4.17kb -> 3.18kb (23.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png -- 0.68kb -> 0.53kb (21.39%)
/src/main/resources/assets/techreborn/textures/blocks/cables/superconductor_cable.png -- 0.67kb -> 0.54kb (20%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/watermill_side_on.png -- 2.64kb -> 2.12kb (19.77%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_reinforced_tungstensteel_block_ctm.png -- 1.79kb -> 1.46kb (18.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_front.png -- 0.96kb -> 0.80kb (16.7%)
/src/main/resources/assets/techreborn/textures/gui/batbox.png -- 1.77kb -> 1.48kb (16.24%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_top_on.png -- 1.13kb -> 0.96kb (14.97%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_side.png -- 0.95kb -> 0.81kb (14.59%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_sctm.png -- 2.12kb -> 1.82kb (14.26%)
/src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png -- 0.71kb -> 0.62kb (13.93%)
/src/main/resources/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png -- 4.23kb -> 3.65kb (13.8%)
/src/main/resources/assets/techreborn/textures/gui/mfe.png -- 2.05kb -> 1.78kb (13.36%)
/src/main/resources/assets/techreborn/textures/gui/mfsu.png -- 2.05kb -> 1.78kb (13.36%)
/src/main/resources/assets/techreborn/textures/gui/aesu.png -- 2.08kb -> 1.81kb (13.07%)
/src/main/resources/assets/techreborn/textures/gui/idsu.png -- 2.08kb -> 1.81kb (13.07%)
/src/main/resources/assets/techreborn/textures/gui/lesu.png -- 2.08kb -> 1.81kb (12.99%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_top_off.png -- 0.89kb -> 0.78kb (11.96%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png -- 1.54kb -> 1.40kb (9.37%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png -- 2.04kb -> 1.85kb (9.14%)
/src/main/resources/assets/techreborn/textures/items/plate/iron_plate.png -- 0.62kb -> 0.57kb (8.76%)
/src/main/resources/assets/techreborn/textures/items/ingot/chrome_ingot.png -- 0.59kb -> 0.54kb (8.14%)
/src/main/resources/assets/techreborn/textures/items/dust/ashes_dust.png -- 0.48kb -> 0.44kb (7.96%)
/src/main/resources/assets/techreborn/textures/items/part/energy_flow_circuit.png -- 0.74kb -> 0.68kb (7.68%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png -- 0.69kb -> 0.64kb (7.64%)
/src/main/resources/assets/techreborn/textures/items/ingot/refined_iron_ingot.png -- 0.60kb -> 0.56kb (7.63%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_sctm.png -- 2.16kb -> 2.00kb (7.29%)
/src/main/resources/assets/techreborn/textures/items/part/tungsten_grinding_head.png -- 0.82kb -> 0.76kb (7.15%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/charge_bench_side_off.png -- 0.90kb -> 0.85kb (6.17%)
/src/main/resources/assets/techreborn/textures/items/ingot/zinc_ingot.png -- 0.59kb -> 0.56kb (6.11%)
/src/main/resources/assets/techreborn/textures/blocks/storage/refinediron_block.png -- 0.63kb -> 0.60kb (5.7%)
/src/main/resources/assets/techreborn/textures/items/ingot/titanium_ingot.png -- 0.59kb -> 0.56kb (5.64%)
/src/main/resources/assets/techreborn/textures/blocks/machines/energy/lv_transformer_side.png -- 0.68kb -> 0.65kb (5.43%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_ctmh.png -- 2.26kb -> 2.14kb (5.14%)
/src/main/resources/assets/techreborn/textures/items/ingot/silver_ingot.png -- 0.58kb -> 0.56kb (4.85%)
/src/main/resources/assets/techreborn/textures/items/tool/lapotronic_orbpack.png -- 0.72kb -> 0.69kb (4.47%)
/src/main/resources/assets/techreborn/textures/models/lapotronpack.png -- 0.64kb -> 0.61kb (4.29%)
/src/main/resources/assets/techreborn/textures/items/ingot/aluminum_ingot.png -- 0.58kb -> 0.56kb (3.89%)
/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png -- 0.89kb -> 0.86kb (3.83%)
/src/main/resources/assets/techreborn/textures/items/part/cupronickel_heating_coil.png -- 0.51kb -> 0.49kb (3.8%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier3_casing_ctmh.png -- 2.41kb -> 2.33kb (3.4%)
/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png -- 0.89kb -> 0.86kb (3.28%)
/src/main/resources/assets/techreborn/textures/blocks/storage/steel_block.png -- 0.60kb -> 0.58kb (3.09%)
/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png -- 0.89kb -> 0.86kb (3.07%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier2_casing_ctmh.png -- 2.36kb -> 2.29kb (3.06%)
/src/main/resources/assets/techreborn/textures/items/part/nichrome_heating_coil.png -- 0.51kb -> 0.49kb (2.88%)
/src/main/resources/assets/techreborn/textures/items/tool/cloaking_device.png -- 0.58kb -> 0.56kb (2.86%)
/src/main/resources/assets/techreborn/textures/blocks/reinforced_glass.png -- 0.63kb -> 0.61kb (2.64%)
/src/main/resources/assets/techreborn/textures/blocks/storage/titanium_block.png -- 0.61kb -> 0.59kb (2.57%)
/src/main/resources/assets/techreborn/textures/blocks/storage/silver_block.png -- 0.61kb -> 0.59kb (2.57%)
/src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb.png -- 0.58kb -> 0.56kb (2.53%)
/src/main/resources/assets/techreborn/textures/items/part/kanthal_heating_coil.png -- 0.51kb -> 0.49kb (2.32%)
/src/main/resources/assets/techreborn/textures/blocks/machines/structure/tier1_casing_sctm.png -- 1.95kb -> 1.91kb (2.11%)
/src/main/resources/assets/techreborn/textures/blocks/storage/chrome_block.png -- 0.61kb -> 0.59kb (2.1%)
/src/main/resources/assets/techreborn/textures/gui/elements.png -- 11.76kb -> 11.53kb (2.01%)
/src/main/resources/assets/techreborn/textures/items/ingot/steel_ingot.png -- 0.57kb -> 0.56kb (1.89%)
/src/main/resources/assets/techreborn/textures/items/part/data_control_circuit.png -- 0.58kb -> 0.57kb (1.69%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_blast_furnace_front_on.png -- 1.73kb -> 1.71kb (1.58%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_grinder_front_on.png -- 1.35kb -> 1.33kb (1.51%)
/src/main/resources/assets/techreborn/textures/blocks/storage/iridium_block.png -- 0.60kb -> 0.59kb (1.3%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_west_on.png -- 1.39kb -> 1.37kb (1.19%)
/src/main/resources/assets/techreborn/textures/items/part/diamond_grinding_head.png -- 0.83kb -> 0.82kb (1.06%)
/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_on.png -- 0.90kb -> 0.89kb (0.98%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/implosion_compressor_east_on.png -- 1.39kb -> 1.38kb (0.91%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier2_machines/industrial_centrifuge_front_on.png -- 1.57kb -> 1.56kb (0.56%)
/src/main/resources/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png -- 1.38kb -> 1.38kb (0.21%)
|
2018-07-28 18:38:58 +00:00 |
|
modmuss50
|
3659bfa5eb
|
Fix some small issues with the json files
|
2018-07-28 13:05:43 +01:00 |
|
modmuss50
|
88e116d095
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-07-26 18:28:58 +01:00 |
|
modmuss50
|
8139b865a9
|
Fix potential issues
|
2018-07-26 18:16:59 +01:00 |
|
drcrazy
|
2b74ea1ebe
|
Removed excessive finals.
|
2018-07-16 18:19:31 +03:00 |
|
drcrazy
|
5ce0397575
|
Changed Blocks.AIR to Material.AIR in multiblock checks.
|
2018-07-16 15:46:39 +03:00 |
|
drcrazy
|
60873481f3
|
Unused anymore.
|
2018-07-13 18:04:50 +03:00 |
|
drcrazy
|
c35d85fe10
|
More loot tables.
|
2018-07-12 17:41:14 +03:00 |
|
drcrazy
|
760dea8f94
|
Moved Event Bus registration to compat module.
|
2018-07-10 02:24:05 +03:00 |
|
drcrazy
|
2b32e6ecf1
|
Moved IC2 compat recipes from postInit to event. Closes #1565
|
2018-07-10 02:13:48 +03:00 |
|
drcrazy
|
1777343e96
|
Added TR loot to basic Overworld chests.
|
2018-07-09 17:06:15 +03:00 |
|
YuRaNnNzZZ
|
ced370444f
|
adv/diamond electric tools charge rate buff (#1558) (Kudos to YuRaNnNzZZ)
|
2018-06-26 11:53:21 +03:00 |
|
drcrazy
|
ff9ceecc28
|
Removed unused imports )
|
2018-06-25 14:55:23 +03:00 |
|
modmuss50
|
d4a43d24a1
|
Fix incorrect usage of item stack checking
I have no idea how they worked without issue for this long :D
|
2018-06-25 12:34:13 +01:00 |
|
drcrazy
|
96d78c11a8
|
Shift for more info on powerbar. Closes FTBTeam/FTB-Continuum#261
|
2018-06-25 12:26:07 +03:00 |
|
modmuss50
|
7124ee6a11
|
Remove range upgrade as it didnt do anything
|
2018-06-24 10:48:47 +01:00 |
|
drcrazy
|
00a317074d
|
Speed up items charge.
|
2018-06-24 12:20:06 +03:00 |
|
drcrazy
|
af6cb38bfb
|
Fix crash with non-TR items charge.
|
2018-06-24 12:14:12 +03:00 |
|
drcrazy
|
d6b9656b7c
|
Fix for Assembly Machine JEI GUI progress. Closes #1555
|
2018-06-23 19:30:33 +03:00 |
|
drcrazy
|
452932c04e
|
More formatting changes.
|
2018-06-23 19:00:44 +03:00 |
|
Eric Chai
|
52ff6699b4
|
Fusion reactor consumes resources. Fixes #1551 (#1556)
Since resources are consumed during start up, they should also
be consumed when resetting the crafting cycle.
|
2018-06-23 18:40:56 +03:00 |
|
drcrazy
|
1de3fe5dc5
|
Lot of formatting.
|
2018-06-22 18:22:16 +03:00 |
|
drcrazy
|
d584aebcd8
|
Fixed water mill animation.
|
2018-06-22 13:35:26 +03:00 |
|
drcrazy
|
30302e241b
|
Fixed charging \ discharging items items. Closes #1547
|
2018-06-20 18:27:58 +03:00 |
|
Eric Chai
|
ca9a2c9b38
|
Corrected the ADVANCED_JACKHAMMER recipe (#1553)
|
2018-06-20 11:45:47 +03:00 |
|
drcrazy
|
48d2227407
|
Made batteries charge configurable for non-basic batteries.
|
2018-06-19 14:01:10 +03:00 |
|
ProfessorProspector
|
1ebf67d933
|
Add Silk Touch to the rock cutter in the recipe and creative tab, so it's more obvious of what it does
|
2018-06-16 10:27:19 -07:00 |
|
ProfessorProspector
|
a32c40a68a
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-06-16 10:05:16 -07:00 |
|
ProfessorProspector
|
77ed9f7bba
|
Remove accidental refined diamond
|
2018-06-16 10:03:20 -07:00 |
|
modmuss50
|
0e857e8b70
|
Fix #1546
|
2018-06-16 16:37:17 +01:00 |
|
drcrazy
|
7be239adca
|
Updated wrenching logic for energy storages and casings. Closes #1543
|
2018-06-15 18:18:32 +03:00 |
|
drcrazy
|
24bce3ce66
|
Updated wrenching for lamp and alarm
|
2018-06-15 17:26:43 +03:00 |
|
drcrazy
|
8d1c116df0
|
Updated wrench logic for cables.
|
2018-06-15 16:49:46 +03:00 |
|
ProfessorProspector
|
603e346c0f
|
New ore textures
|
2018-06-14 19:17:53 -07:00 |
|
ProfessorProspector
|
9ed05fb7ff
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
# src/main/java/techreborn/blocks/BlockAlarm.java
|
2018-06-14 10:57:07 -07:00 |
|
ProfessorProspector
|
cfda5fd2a4
|
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
# src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
# src/main/java/techreborn/blocks/generator/BlockWaterMill.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
|
2018-06-14 10:53:32 -07:00 |
|
drcrazy
|
c409b67c3c
|
Updated block wrenching
|
2018-06-14 18:32:41 +03:00 |
|
drcrazy
|
77e1c54b86
|
Fixed inventory drop for DSU. More work on #1543
|
2018-06-14 18:32:40 +03:00 |
|
drcrazy
|
42bc110cb2
|
Fixed build, but DSU blocks are not done yet.
|
2018-06-13 17:42:46 +03:00 |
|
drcrazy
|
e2225b06d4
|
Updated wrenching logic. Some work for #1543
|
2018-06-13 15:28:31 +03:00 |
|
Prospector
|
6d3b415ddd
|
Unify creative tabs
|
2018-06-12 15:42:20 -07:00 |
|
drcrazy
|
baacc67a64
|
Fixed unused and override warnings.
|
2018-06-12 12:55:57 +03:00 |
|
modmuss50
|
7db0097d23
|
Fusion reactor uses inputs before the craft starts to prevent power exploit, closes #1539
|
2018-06-10 11:53:03 +01:00 |
|
modmuss50
|
c201b3dbcf
|
Make fusion reactor recipe shapeless, so it can work either way around
|
2018-06-10 11:47:51 +01:00 |
|
modmuss50
|
32ea97b29e
|
Fix #1541
|
2018-06-10 11:41:45 +01:00 |
|
modmuss50
|
dace0e56d0
|
Show required stacks when building fusion reactor
|
2018-06-10 11:36:21 +01:00 |
|
冷风
|
6fc0687d76
|
Update zh_cn.lang
|
2018-06-10 09:47:50 +08:00 |
|
modmuss50
|
475eb4b55f
|
Revert "Fixed warning in stack tooltip event."
This reverts commit 1614f71
|
2018-06-09 17:03:07 +01:00 |
|
modmuss50
|
d9b8f274e0
|
Add rubber tree biome blacklist, closes #1529
|
2018-06-09 12:39:55 +01:00 |
|
modmuss50
|
354a80572c
|
Tweak power output of fusion reactor, closes #1521
|
2018-06-09 12:26:11 +01:00 |
|
modmuss50
|
0536ef08a0
|
Fix some final issues with the slabs + add recipes
|
2018-06-09 11:32:02 +01:00 |
|
modmuss50
|
a567139ffd
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2018-06-09 11:19:31 +01:00 |
|
modmuss50
|
1e129640fe
|
Copy itemstacks before checking them for valid wood recipes, should fix #1538
|
2018-06-09 11:19:16 +01:00 |
|
Yaroslavik
|
821d4081a3
|
Update ru_ru.lang
Translate rubber plank stairs and slab
|
2018-06-09 00:33:44 +02:00 |
|
modmuss50
|
60c8527f6d
|
Rubber plank stairs and slab
|
2018-06-08 21:05:56 +01:00 |
|
modmuss50
|
169fa646fb
|
Add slot config to iron furnace, fixes #1536
|
2018-06-08 18:46:50 +01:00 |
|
modmuss50
|
914aa3423b
|
Fixes #1533
|
2018-06-08 18:39:16 +01:00 |
|
modmuss50
|
548d393820
|
Allow repairing gem tools and armor in anvil
|
2018-06-08 18:33:26 +01:00 |
|
drcrazy
|
93e324cc11
|
Fixed electric tree tap. Closes #1535
|
2018-06-08 15:46:28 +03:00 |
|
drcrazy
|
23428d3223
|
Made transfer rate per connection
|
2018-06-07 03:09:03 +03:00 |
|
modmuss50
|
cbc302ff48
|
Decrease speed of by 3 ticks electrical furnace when using 4 overclockers
|
2018-06-05 21:57:04 +01:00 |
|
drcrazy
|
e834ba390d
|
Updated industrial electrolyzer crafting recipe.
|
2018-06-01 14:18:06 +03:00 |
|
drcrazy
|
74107dd3ea
|
Made cable not able to receive energy if full. Same for provide/empty
|
2018-06-01 14:03:45 +03:00 |
|
drcrazy
|
5e960ec3f2
|
Updated JEI support for rolling machine.
|
2018-05-31 20:36:53 +03:00 |
|
drcrazy
|
2574a898d8
|
Bumped requred forge version
|
2018-05-30 17:14:00 +03:00 |
|
drcrazy
|
2fb4c4559e
|
Removed unused variable
|
2018-05-30 17:01:56 +03:00 |
|
drcrazy
|
3930b150a0
|
Fixed warning with TE registration
|
2018-05-30 16:57:23 +03:00 |
|
drcrazy
|
f59a4775a9
|
Fixed license and updated Thermal and Forge deps
|
2018-05-30 15:00:54 +03:00 |
|
drcrazy
|
362a93af3d
|
Fixed BC fuel energy gen. Closes #1524
|
2018-05-29 13:50:06 +03:00 |
|
modmuss50
|
874b08e919
|
only check tiles on the minecraft resource domain, should be a bit quicker
|
2018-05-27 10:58:20 +01:00 |
|
modmuss50
|
6bc73adc35
|
Rewrite tile registry + rename all tiles. Worlds should upgrade fine using datafixers
|
2018-05-27 10:53:26 +01:00 |
|
modmuss50
|
959e318859
|
Add energy storage to RebornCore's wrenableBlocks list
|
2018-05-26 20:38:47 +01:00 |
|
drcrazy
|
24c41f356f
|
Bumped up lighting rod
|
2018-05-26 02:55:01 +03:00 |
|
drcrazy
|
1614f71244
|
Fixed warning in stack tooltip event.
|
2018-05-25 17:51:52 +03:00 |
|
drcrazy
|
1ad23439eb
|
Cleaned up supressed warnings
|
2018-05-25 14:24:35 +03:00 |
|
drcrazy
|
6d242b08d5
|
Nano Saber energy storage is now configurable.
|
2018-05-25 12:12:59 +03:00 |
|
drcrazy
|
e7644b6b68
|
Updated storage values for powered items
|
2018-05-25 11:50:32 +03:00 |
|
modmuss50
|
7ab300a810
|
Make Craft Tweaker removeInputRecipe less strict, https://github.com/FTBTeam/FTB-Continuum/issues/58
Hopefully this doesnt break scripts, let me know if it does ;)
|
2018-05-24 11:36:43 +01:00 |
|
modmuss50
|
1c6e26dd99
|
Fix minor mistake
|
2018-05-23 15:06:29 +01:00 |
|
modmuss50
|
02c708cd21
|
Final changes to the item power storage
|
2018-05-23 14:49:14 +01:00 |
|
modmuss50
|
682670ca51
|
Item charging + discharging is now done using the caps
|
2018-05-23 14:07:37 +01:00 |
|
drcrazy
|
250a25d25f
|
Fixed durability bar
|
2018-05-23 01:33:07 +03:00 |
|
drcrazy
|
ff18e28d1c
|
Remaining changes for powered items.
|
2018-05-23 00:36:11 +03:00 |
|
drcrazy
|
f203bbbefd
|
Started work on capability for powered item
|
2018-05-23 00:27:35 +03:00 |
|
drcrazy
|
c4c5f2135c
|
Started work in switching powered items to capability
|
2018-05-23 00:27:33 +03:00 |
|
modmuss50
|
eb4ba94593
|
Fix https://github.com/FTBTeam/FTB-Continuum/issues/52
|
2018-05-20 21:41:58 +01:00 |
|
modmuss50
|
d2f6f89838
|
Load recipes a bit earlier to fix some issues with crafttweaker, hopefully this doesnt break anything thing else. Fixes #1520
|
2018-05-20 16:01:58 +01:00 |
|
modmuss50
|
66bb38543e
|
Fix #1517
|
2018-05-20 15:43:46 +01:00 |
|
modmuss50
|
8ef39d18e8
|
Reduce the time on some recipes
|
2018-05-18 11:27:49 +01:00 |
|
drcrazy
|
85b736065c
|
Fixed charge of TR items.
|
2018-05-18 12:34:58 +03:00 |
|
modmuss50
|
4c73363206
|
Fixes #1513
|
2018-05-17 11:12:21 +01:00 |
|
modmuss50
|
c20e1c72a9
|
Fixes #1515
|
2018-05-17 11:00:35 +01:00 |
|