modmuss50
|
e03734e66d
|
Fix #1669
|
2019-02-20 19:39:23 +00:00 |
|
modmuss50
|
0086d88e1d
|
#releaseBuild
|
2019-02-17 19:00:30 +00:00 |
|
modmuss50
|
4aae2422fa
|
Fix LED lights not using correct cables
|
2019-02-15 19:12:11 +00:00 |
|
modmuss50
|
65b95afed8
|
After complaints that the manual is a scam, you can now refund it back into its ingredients.
Can be disabled in config
|
2019-02-15 18:33:45 +00:00 |
|
drcrazy
|
8b82259871
|
Iron and gold armor recycling in blast furnace.
|
2019-02-15 14:19:48 +03:00 |
|
modmuss50
|
4addff892b
|
Create a WrenchContext to allow for ic2 mod compat to register support for using ic2's wrench
|
2019-02-14 15:58:33 +00:00 |
|
drcrazy
|
8e34062f6e
|
Iron alloy smelter should consume right amount of inputs. Closes #1667
|
2019-02-13 14:56:49 +03:00 |
|
drcrazy
|
fbcab3bf2d
|
DRY for IronAlloySmelter fuel burn time
|
2019-02-13 11:21:21 +03:00 |
|
modmuss50
|
008358b39c
|
#releaseBuild
|
2019-02-11 23:50:48 +00:00 |
|
drcrazy
|
3fb799e544
|
Removed unused imports
|
2019-02-11 15:35:37 +03:00 |
|
drcrazy
|
0fa72c4fc3
|
More efficient diamond grinding and armor recycling
|
2019-02-11 15:32:24 +03:00 |
|
modmuss50
|
3610535169
|
#releaseBuild
|
2019-02-07 21:26:37 +00:00 |
|
modmuss50
|
b9169c5397
|
Merge remote-tracking branch 'origin/1.12' into 1.12
|
2019-02-07 20:26:52 +00:00 |
|
modmuss50
|
c4fff1bf56
|
Should fix #1666
|
2019-02-07 20:26:41 +00:00 |
|
modmuss50
|
4797d64f5b
|
#releaseBuild fix Advanced alloy
|
2019-02-05 00:15:43 +00:00 |
|
modmuss50
|
16ec10dcd3
|
Added config for classic dedupe, #releaseBuild
|
2019-02-04 21:59:22 +00:00 |
|
modmuss50
|
6595bb80c5
|
Move type registry to before the ic2 dict, add advanced alloy to classic dedupe.
|
2019-02-04 21:51:21 +00:00 |
|
modmuss50
|
8549129870
|
Dont register refined iron smelting recipe with classic dedupe enabled
|
2019-02-04 21:27:49 +00:00 |
|
modmuss50
|
f836fb84c7
|
Move IC2_PROFILE to a config, the event is fired too early to be used.
|
2019-02-04 20:53:33 +00:00 |
|
modmuss50
|
6916de2ad7
|
Added support for ic2 exp classic profile
|
2019-02-04 20:19:51 +00:00 |
|
Modmuss50
|
bccfe14d7c
|
#releaseBuild fixes issues with transformers
|
2019-02-02 06:35:29 +00:00 |
|
modmuss50
|
094f2fc050
|
#releaseBuild
|
2019-02-01 15:32:05 +00:00 |
|
modmuss50
|
9301cfbc90
|
Improve rolling machine item balancing, it will no longer move items around when there isnt a better distribution
|
2019-02-01 14:46:18 +00:00 |
|
modmuss50
|
72a09d2368
|
Fixes some possible NPE locations
|
2019-02-01 13:42:21 +00:00 |
|
Modmuss50
|
a5fa237017
|
Merge pull request #1660 from coderbot16/1.12-multipackets
Transformers now declare that they can output multiple packets per tick
|
2019-01-30 19:41:14 +00:00 |
|
coderbot
|
3e44fc369f
|
Transformers now declare that they can output multiple packets per tick
|
2019-01-28 17:38:02 -08:00 |
|
modmuss50
|
12b892f0dc
|
Fix Alarm recipe with IC2 Dedupe
|
2019-01-27 01:42:52 +00:00 |
|
modmuss50
|
039537fcdb
|
#releaseBuild
|
2019-01-26 19:24:39 +00:00 |
|
modmuss50
|
8505616651
|
Fix fusion coil not being crafted with ic2 de-dupe
|
2019-01-26 19:06:51 +00:00 |
|
modmuss50
|
199fa63041
|
#releaseBuild - New IF and Baubles integration
|
2019-01-24 22:51:39 +00:00 |
|
modmuss50
|
0228d72179
|
Always add refined iron ingot to smelting, I forgot to remove it
|
2019-01-24 21:38:21 +00:00 |
|
modmuss50
|
f4a24d7c25
|
Fixes to retro gen
|
2019-01-24 21:35:39 +00:00 |
|
modmuss50
|
5a9349ced4
|
Pull back power output on Thermal gen as I made it a bit too much last commit. Now 16
|
2019-01-24 21:26:56 +00:00 |
|
Modmuss50
|
bc1e2ca7eb
|
Thermal Generator now outputs 32 eu/tick
|
2019-01-20 21:14:15 +00:00 |
|
Modmuss50
|
0bd22f1a55
|
Added pack count to readme
|
2019-01-19 23:58:38 +00:00 |
|
modmuss50
|
7415c33ac8
|
#releaseBuild Fix startup crash
|
2019-01-18 16:51:08 +00:00 |
|
modmuss50
|
bc4deb44ef
|
Update
|
2019-01-18 16:45:31 +00:00 |
|
modmuss50
|
132aefd81e
|
#releaseBuild
|
2019-01-18 16:26:01 +00:00 |
|
modmuss50
|
498d675f30
|
Remove Refined Iron from ic2 duplicates
|
2019-01-18 16:20:34 +00:00 |
|
drcrazy
|
292664b8e1
|
Fixed i18n usage on server. Closes #1655
|
2019-01-16 18:07:48 +03:00 |
|
drcrazy
|
ecda412b46
|
Bumped forge to 14.23.5.2796
|
2019-01-14 16:07:06 +03:00 |
|
drcrazy
|
7cc0c472f9
|
Adjustments for updated power output icon.
|
2019-01-14 15:11:26 +03:00 |
|
drcrazy
|
1a8c730591
|
Plasma generator got its icon in JEI. Closes #1653
|
2019-01-14 14:10:26 +03:00 |
|
drcrazy
|
8a03b0eca2
|
More on #1654
|
2019-01-14 14:04:58 +03:00 |
|
drcrazy
|
381fbfb463
|
Fix JEI info for sawmill energy usage. Some work for #1654
|
2019-01-14 14:04:22 +03:00 |
|
modmuss50
|
f08fd1da4d
|
1591 - I think ill come back to this another day
|
2019-01-13 17:04:03 +00:00 |
|
modmuss50
|
b6312b124a
|
1696 - find + replace pass
|
2019-01-13 16:51:50 +00:00 |
|
modmuss50
|
368e2d48df
|
2123 - Gradle setup
|
2019-01-12 19:56:42 +00:00 |
|
modmuss50
|
4422fc7dc0
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/gui/GuiBlastFurnace.java
# src/main/java/techreborn/client/gui/GuiDistillationTower.java
# src/main/java/techreborn/client/gui/GuiFluidReplicator.java
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/compat/CompatManager.java
|
2019-01-12 12:08:28 +00:00 |
|
modmuss50
|
43cf6d7807
|
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep
# Conflicts:
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/client/gui/GuiAlloySmelter.java
# src/main/java/techreborn/client/gui/GuiAssemblingMachine.java
# src/main/java/techreborn/client/gui/GuiChemicalReactor.java
# src/main/java/techreborn/client/gui/GuiCompressor.java
# src/main/java/techreborn/client/gui/GuiDieselGenerator.java
# src/main/java/techreborn/client/gui/GuiElectricFurnace.java
# src/main/java/techreborn/client/gui/GuiExtractor.java
# src/main/java/techreborn/client/gui/GuiGasTurbine.java
# src/main/java/techreborn/client/gui/GuiGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java
# src/main/java/techreborn/client/gui/GuiIronFurnace.java
# src/main/java/techreborn/client/gui/GuiRecycler.java
# src/main/java/techreborn/client/gui/GuiScrapboxinator.java
# src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java
# src/main/java/techreborn/client/gui/GuiThermalGenerator.java
# src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeWrapper.java
# src/main/java/techreborn/compat/jei/assemblingMachine/AssemblingMachineRecipeWrapper.java
# src/main/java/techreborn/compat/jei/blastFurnace/BlastFurnaceRecipeWrapper.java
# src/main/java/techreborn/compat/jei/centrifuge/CentrifugeRecipeWrapper.java
# src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/compressor/CompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/distillationTower/DistillationTowerRecipeWrapper.java
# src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/fluidReplicator/FluidReplicatorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/grinder/GrinderRecipeWrapper.java
# src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeWrapper.java
# src/main/java/techreborn/events/StackToolTipEvent.java
# src/main/java/techreborn/items/armor/ItemCloakingDevice.java
# src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java
# src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java
# src/main/java/techreborn/items/battery/ItemBattery.java
# src/main/java/techreborn/items/battery/ItemEnergyCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronCrystal.java
# src/main/java/techreborn/items/battery/ItemLapotronicOrb.java
# src/main/java/techreborn/items/battery/ItemLithiumIonBattery.java
# src/main/java/techreborn/items/battery/ItemRedCellBattery.java
# src/main/java/techreborn/items/tool/ItemChainsaw.java
# src/main/java/techreborn/items/tool/ItemDrill.java
# src/main/java/techreborn/items/tool/ItemJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedChainsaw.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java
# src/main/java/techreborn/items/tool/advanced/ItemAdvancedJackhammer.java
# src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java
# src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java
# src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java
# src/main/java/techreborn/items/tool/basic/ItemBasicJackhammer.java
# src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java
# src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java
# src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java
# src/main/java/techreborn/tiles/TileChargeOMat.java
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
|
2019-01-07 22:59:06 +00:00 |
|
