Commit graph

3186 commits

Author SHA1 Message Date
drcrazy
0443ad4a3a Destructopack is a separate item 2018-09-03 17:01:46 +03:00
drcrazy
33b9f697dc Merged all ingredients into single class 2018-09-03 14:49:59 +03:00
drcrazy
0b1733b733 DUsts and dustsSmall are combined into single class 2018-09-03 14:00:06 +03:00
drcrazy
f01d75404c Buffed oreCoal processing in Industrial Grinder 2018-09-02 23:45:02 +03:00
Modmuss50
9a19223c84
Revert "Updated JEI compat to use VanillaTypes"
This reverts commit c41b889

Done becuase VanillaTypes are not in a stable build of JEI
2018-09-02 14:02:08 +01:00
drcrazy
08cee81d54 Updated machine names in JEI. 2018-09-01 03:01:51 +03:00
drcrazy
3190185a54 Cleaned fluid translation keys. 2018-09-01 02:46:25 +03:00
Modmuss50
53ad3a7a60
Add configs to the nuke, closes #1594 2018-08-31 16:32:16 +01:00
drcrazy
edf0227598 CLeanup of blocks 2018-08-31 15:36:39 +03:00
Modmuss50
1b0ff5f95a
Fix small naming issue 2018-08-31 13:25:01 +01:00
Modmuss50
cc8c2c6e3b
Fix odd name for Auto Crafting Table 2018-08-31 13:19:55 +01:00
drcrazy
cdaefe5886 Changed translation keys for block and items 2018-08-31 14:51:03 +03:00
Modmuss50
9b0f583cab
Translations are now handled over at https://translate.techreborn.ovh/ using crowdin 2018-08-30 22:47:25 +01:00
drcrazy
2d3c074767 Fix for cells in CT scripts. Some work on #1590 2018-08-29 18:23:56 +03:00
drcrazy
c41b889160 Updated JEI compat to use VanillaTypes 2018-08-29 16:44:45 +03:00
drcrazy
f0852a09cf Updated JEI createDrawable usage for fusion reactor. 2018-08-28 16:43:37 +03:00
drcrazy
f54353290b Updated ru_ru lang. Should fix FTBTeam/FTB-Continuum#437 2018-08-28 14:32:59 +03:00
EnGinners
304046b457 Update ru_ru.lang (#1582)
This one has less changes compare to similar one from @AlekseiVoronin
2018-08-28 13:40:47 +03:00
drcrazy
e254f519c6 Removed excessive not null check 2018-08-28 11:21:15 +03:00
Modmuss50
c1be3fb765
Fixes https://github.com/FTBTeam/FTB-Continuum/issues/428 2018-08-27 18:23:16 +01:00
drcrazy
f44aa92093 Removed unused imports 2018-08-27 17:52:26 +03:00
drcrazy
db4dbdc956 UU-matter is now part of parts enum 2018-08-27 15:48:41 +03:00
drcrazy
8f7cc291bd OreDict partially back, same for some recipes 2018-08-27 15:28:26 +03:00
drcrazy
8987311694 Flattened parts 2018-08-27 13:26:56 +03:00
Modmuss50
f251349189
Should fix #1587 2018-08-24 21:07:38 +01:00
YuRaNnNzZZ
2e461b5ef6
rock cutter no longer gets enchanted on recraft 2018-08-24 20:12:50 +03:00
drcrazy
de45f3e68d SmallDusts flattened 2018-08-24 15:56:53 +03:00
drcrazy
edd4e0df3e Flattened dusts. 2018-08-24 14:56:25 +03:00
drcrazy
1ee9ffb007 Flattened ingots. 2018-08-24 13:43:03 +03:00
drcrazy
aadc7150f3 Gems are flattened 2018-08-23 17:16:17 +03:00
drcrazy
2939ee02a3 Flattened nuggets 2018-08-23 15:20:57 +03:00
drcrazy
45d6317d12 Changes plates registration 2018-08-23 14:05:22 +03:00
drcrazy
c86f3dc2f4 Changes after PR review 2018-08-23 13:36:56 +03:00
drcrazy
f45da44f2b Plates are flattened and enumed 2018-08-23 00:14:02 +03:00
drcrazy
be024f0179 Updated forge 2018-08-22 15:55:14 +03:00
Modmuss50
1d7ff39ccf
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-14 01:09:18 +01:00
Modmuss50
77ec6b6aaf
Hot fix for #1574 #releaseBuild 2018-08-14 01:08:50 +01:00
drcrazy
337a500a5c Coolant part also craftable from water cells 2018-08-13 15:35:30 +03:00
冷风
3681e0b1e3
Update zh_cn.lang 2018-08-13 08:58:10 +08:00
Modmuss50
35f82eb5d3
Update licenses 2018-08-12 16:36:16 +01:00
Modmuss50
4e352c0953
Add creative versions of the Quantum tank and chest, they provide unlimited amount of the specified item/fluid 2018-08-12 16:32:43 +01:00
Modmuss50
84aeeb978c
Fix most modded fluids not working in our machines 2018-08-11 20:08:44 +01:00
Modmuss50
89beff99c7
Fluid config work 2018-08-11 15:23:57 +01:00
Modmuss50
808a07fdbf
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-10 17:46:10 +01:00
Modmuss50
39475f86dc
Initial fluid config work 2018-08-10 17:45:16 +01:00
drcrazy
f7df41c379 Fix for typo in world config name. 2018-08-10 15:38:46 +03:00
drcrazy
d37f52a0ce Less chance for overworld TR loot and made in configurable. CLoses #1572 2018-08-10 15:33:59 +03:00
drcrazy
c3979610a9 Removed unused imports 2018-08-10 15:32:17 +03:00
modmuss50
062114f3a9
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-08 15:15:53 +01:00
modmuss50
7270adbec4
Revert: [ImgBot] optimizes images - Fixes textures having a solid background 2018-08-08 15:15:26 +01:00
drcrazy
fb957e9dac Allow oregen in non-vanilla dimensions. Closes #1571 2018-08-08 17:00:33 +03:00
drcrazy
2e4c3ebf1a Some flattening attempt for plates 2018-08-07 13:50:46 +03:00
modmuss50
53b450acea
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
#	src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
2018-08-03 18:04:40 +01:00
modmuss50
7e49c30586
Add a transparent grey overlay over recipe output slot 2018-08-03 17:55:59 +01:00
modmuss50
ee65ed0cbe
Merge remote-tracking branch 'origin/1.12' into 1.12 2018-08-03 17:47:26 +01:00
modmuss50
e5d161cace
Write locked to nbt 2018-08-03 17:46:58 +01:00
Modmuss50
94fa8d1b62
Merge pull request #1569 from TechReborn/imgbot
[ImgBot] optimizes images
2018-08-03 00:40:16 +01:00
modmuss50
bbef813fe5
thanks idea for importing the best imports, fixes build 2018-08-02 19:09:11 +01:00
modmuss50
b8ad3175fd
Add JEI support for recipes in auto crafting table 2018-08-02 19:07:56 +01:00
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
modmuss50
693cb6807a
Inital pass of cleaning up the networking, I will prob do some more in 1.13 2018-07-24 14:27:17 +01:00
modmuss50
69b9c511c3
Remove legacy tile support 2018-07-24 14:23:31 +01:00
modmuss50
1f65363396
Merge remote-tracking branch 'origin/1.13-prep' into 1.13-prep 2018-07-24 14:18:22 +01:00
modmuss50
1be2752b72
Rename fluids 2018-07-24 14:18:09 +01:00
drcrazy
a42e04606f Done with maxCharge and trasnferRate review for powered items 2018-07-23 14:21:07 +03:00
drcrazy
eb2816df1d Returned return. 2018-07-23 13:47:12 +03:00
drcrazy
b3002b6f57 Fixed warnings 2018-07-23 12:55:18 +03:00
modmuss50
095390b430
Fix cell model 2018-07-20 22:39:09 +01:00
modmuss50
2910acc29c
Remove META_PLACEHOLDER 2018-07-20 22:36:38 +01:00
modmuss50
f5c6b59ebd
Mappings 2018-07-20 22:31:20 +01:00
modmuss50
389b716880
Fix build 2018-07-20 22:10:29 +01:00
modmuss50
7f8ce535a7
General code cleanup 2018-07-20 22:08:21 +01:00
modmuss50
95b49e5e23
Move some stuff around in RC 2018-07-20 22:02:46 +01:00
modmuss50
f78abb1a21
Remove some old stuff 2018-07-20 21:55:29 +01:00
drcrazy
7b630f576f Polishing powered items 2018-07-20 17:23:21 +03:00
drcrazy
daf4b6fad6 Capacity changes for powered armor 2018-07-20 12:58:52 +03:00
drcrazy
b3590dbb37 Make it run but tons of useless copy-paste 2018-07-20 02:56:19 +03:00
drcrazy
523d0284b7 Updated powered items to match RC changes 2018-07-19 18:30:47 +03:00
modmuss50
b65e963f12
Move all mod compatibility out into its own mod, ic2 support is gone and will come back in some more basic form once ic2 is on 1.13
The new mod compatibility will be included (either shaded or jar-in-jar) in the main TR distrubtion, this has been done to aid development
2018-07-19 10:48:37 +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