modmuss50
774fec221e
Auto format code
2017-06-28 20:54:12 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support
2017-06-28 20:50:00 +01:00
Nourepide
c8dfcb3ba5
Fix missing names in JEI ( #1149 )
...
* Fix missing names in GUI machines
* Fix missing names in JEI
2017-06-23 14:05:44 +01:00
modmuss50
a701094d1d
Update all license headers
2017-06-15 12:28:26 +01:00
modmuss50
426001251f
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2017-06-14 23:30:35 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing.
2017-06-14 22:50:20 +01:00
Prospector
40e3062903
Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)
2017-06-14 08:56:09 -07:00
modmuss50
708ccc758a
Mappings update
2017-06-13 22:07:49 +01:00
modmuss50
2292741443
Update walia support
2017-06-13 20:37:17 +01:00
modmuss50
2df2a1d1ba
Remove old config system
2017-06-12 20:51:36 +01:00
modmuss50
b7e141e004
More config changes
2017-06-12 20:33:30 +01:00
modmuss50
b25742dde0
Auto format code
2017-06-12 14:23:32 +01:00
modmuss50
624d8fb93a
Remove old cables
2017-06-12 10:55:26 +01:00
modmuss50
06d366b941
Update Gradle + JEI compact
2017-06-12 09:48:52 +01:00
modmuss50
29cf9fa90b
1.12
2017-06-11 21:22:07 +01:00
Prospector
81f701477c
Fix compile
2017-06-09 08:47:44 -07:00
modmuss50
cba5fff3c2
Remove new cable from JEI blacklist
2017-06-09 15:11:59 +01:00
Prospector
2b7868c651
More configs & start fixing cable models
2017-06-08 19:12:58 -07:00
Prospector
ad36dfcddb
Started redoing config
2017-06-08 11:45:30 -07:00
modmuss50
2eac072a92
Update to fix compile issues with new JEI api
2017-06-08 11:13:01 +01:00
modmuss50
0aafea9758
Should fix issues with recipes not being removed from JEI when using CT, closes #1121 and closes #1118
2017-06-06 12:56:50 +01:00
modmuss50
d863417e7b
Hide invalid recipes when de-dupe mode is on, closes #1078
...
(cherry picked from commit 7e593bc)
2017-06-02 20:13:23 +01:00
modmuss50
2c16bf58b7
Update license header
2017-06-02 19:35:51 +01:00
modmuss50
6eae3e637e
Hide cable in JEI + update JEI compat
2017-06-02 16:24:40 +01:00
modmuss50
aa50cfa7b9
Fix minetweaker changes not showing in JEI, closes #1068
2017-06-02 16:22:07 +01:00
modmuss50
029a75522c
Add basic crafttweaker support for scrapbox
2017-06-02 16:00:07 +01:00
modmuss50
a6d0e57d10
Add expensive quarry recipe back in.
2017-06-02 15:44:00 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support
2017-04-21 09:09:28 +01:00
ProfessorProspector
01d1650ebf
A few texture fixes and hide source blocks
2017-04-08 09:26:27 -07:00
drcrazy
b136a534aa
Industrial Sawmill support for JEI done
2017-04-08 01:52:29 +03:00
drcrazy
291eadfeed
More work for Sawmill
2017-04-07 18:22:37 +03:00
drcrazy
8b4ce46e46
Initial commit for Insdustrial Sawmill JEI support
2017-04-07 02:53:09 +03:00
modmuss50
da6925195b
Update CraftTweaker support
2017-03-14 12:59:17 +00:00
modmuss50
26c208e811
Added license info to the header of all files.
2017-02-23 12:29:43 +00:00
modmuss50
e93c580528
Fix Minetweaker issue.
2017-01-16 10:06:11 +00:00
ProfessorProspector
38525a5bb0
Multiblock work, and industrial grinder gui
2017-01-14 11:06:34 -08:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
ProfessorProspector
af91263621
Chemical reactor GUI & a couple recipe fixes
2017-01-09 16:54:48 -08:00
ProfessorProspector
dc160bbd67
started with one thing...then I ended up doing a lot of shit.
2017-01-08 23:03:36 -08:00
ProfessorProspector
0c4895efa4
Electric Furnace gui!
2017-01-08 14:46:13 -08:00
ProfessorProspector
eea9b83a9c
Generator gui!
2017-01-08 14:07:34 -08:00
modmuss50
6aa8fde64a
Update to support updated recipe format in reborn core.
2017-01-08 21:43:15 +00:00
ProfessorProspector
2a78196939
Revamp centrifuge jei support
2017-01-08 12:29:14 -08:00
Ourten
b93fe6c5ad
Convert FusionReactor
2017-01-08 16:32:03 +01:00
Ourten
bd16289c60
Convert IndustrialElectrolyzer, IndustrialGrinder and IndustrialSawmill
2017-01-08 16:20:13 +01:00
Ourten
b5881e2102
Convert VacuumFreezer and ImplosionCompressor
2017-01-08 16:01:24 +01:00
Ourten
ad890079ec
Convert RollingMachine
2017-01-08 14:00:19 +01:00
Ourten
8a0a133e02
Convert AlloyFurnace and AlloySmelter
2017-01-08 13:10:13 +01:00
ProfessorProspector
3c40e25b6a
Centrifuge stuff
2017-01-08 03:18:28 -08:00
ProfessorProspector
0cccb0a91b
Merge branch 'feature/containers-builder' of https://github.com/TechReborn/TechReborn into feature/containers-builder
...
# Conflicts:
# src/main/java/techreborn/client/gui/GuiBatbox.java
# src/main/java/techreborn/client/gui/GuiQuantumChest.java
2017-01-07 20:22:34 -08:00
ProfessorProspector
d385e6eaf4
Batbox gui overhaul
2017-01-07 20:09:46 -08:00
Ourten
d77ed99e8a
Convert AssemblingMachine
2017-01-08 02:31:37 +01:00
Ourten
35329cdc4a
Convert ChemicalReactor
2017-01-08 02:23:03 +01:00
Ourten
60c88884a7
Convert Centrifuge
2017-01-08 02:19:26 +01:00
Ourten
94a0616d8e
Add JEI transfer support for ContainerBuilder + Convert Compressor, Extractor and Grinder
2017-01-08 02:04:02 +01:00
ProfessorProspector
2ad33bd6a9
The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient.
2017-01-04 14:19:41 -08:00
Prospector
6a70424252
Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
2016-12-31 23:29:32 -08:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/init/IC2Dict.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
al132
8306ebc72c
Fix display slots in Fusion Reactor JEI
2016-12-22 11:29:07 -06:00
modmuss50
936ee13686
Remove last duplicated items.
2016-12-21 17:44:44 +00:00
modmuss50
5ff09a7eda
Some more work on deduplicating ic2 items/blocks
2016-12-21 17:31:52 +00:00
modmuss50
bfcc3a2117
Initial work on IC2 de-duplication
2016-12-18 21:36:29 +00:00
Ourten
baebc948d9
Add JEI integration for fluid generators recipes
2016-12-18 04:02:51 +01:00
Ourten
abcef5aace
Add fluidstack info to jei recipe for IndustrialGrinder
2016-12-14 02:08:22 +01:00
ProfessorProspector
61de7101c3
TOP support now changes colours based on energy system config
2016-12-10 17:15:30 -08:00
modmuss50
c04a98061a
Hide Missing recipe item in JEI
2016-12-05 12:50:55 +00:00
modmuss50
72f85d5243
Auto format code.
2016-12-05 10:48:21 +00:00
modmuss50
2fdce5405b
Improve block names
2016-12-05 09:40:55 +00:00
modmuss50
c72c3b5851
Update JEI support, in a few places I could not figure it out, so there may be some issues.
2016-11-28 15:28:32 +00:00
modmuss50
e16c3eba02
Auto format
2016-11-25 13:25:51 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing
2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update
2016-11-19 12:50:08 +00:00
modmuss50
603c12590d
Update to support RC 2.8
2016-11-04 20:03:05 +00:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732
2016-10-08 21:56:24 +01:00
modmuss50
796df6c055
Auto Format code
2016-10-08 20:46:16 +01:00
modmuss50
7b162009c2
Hide Quantum chest and tanks when quantumstorage is loaded
2016-09-27 17:50:34 +01:00
way2muchnoise
fb6feac92f
update to JEI 3.11 ( #757 )
2016-09-27 17:03:57 +01:00
modmuss50
edf266588f
Fix wrench recipe issues
...
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
modmuss50
0a2e878b88
Fix #738
2016-09-07 08:21:42 +01:00
modmuss50
d5ff2a42bb
Fixes #723 and wrench works with ic2 machines now
2016-09-06 22:16:21 +01:00
modmuss50
22fd152ec9
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
...
This reverts commit be4f10b975
.
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
Dragon2488
be4f10b975
Energy storages item charging fixes, transformers fixes, electric items fixes.
2016-07-25 15:10:55 +07:00
Dragon2488
b42b5274b5
Multiblock fixes (compressor, freezer, grinder), grinder recipes fixes, freezer JEI recipe show fix.
2016-07-25 02:26:15 +07:00
Dragon2488
0011553cf7
Sawmill changes & fixes.
2016-07-24 01:10:37 +07:00
al132
48cbda6453
Add CraftTweaker support for the Compressor ( #677 )
2016-07-17 21:31:56 +01:00
Prospector
ddb96d58ec
Merge pull request #672 from Dragon2488/1.9.4
...
Properly integration with IC2 through ore dictionary. JEI recipes...
2016-07-15 04:05:16 -07:00
Dragon2488
1f197c3728
Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions.
2016-07-15 17:28:41 +07:00
al132
01516c93a3
Fix CraftTweaker compatibility
...
A version of CraftTweaker that is compatible with 1.9.4 has been
released since the Minetweaker/CraftTweaker dependency was removed. I
have restored compatibility with the new version of CraftTweaker
2016-07-14 17:15:36 -05:00
modmuss50
fa9e941217
Update JEI
2016-07-01 15:55:44 +01:00
modmuss50
315c0aa509
Revert "Revert a shit load of stuff"
...
This reverts commit d25bb23e8e
.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e
Revert a shit load of stuff
2016-07-01 15:40:46 +01:00
modmuss50
2c6cc4b298
Clean up ic2 recipes a little
2016-06-06 19:59:10 +01:00
modmuss50
9c0f0fa111
Started work on the recipe links
2016-06-06 19:52:46 +01:00
modmuss50
973f68496c
Merge branch '1.9.4' into 1.9.4-ic2
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
Prospector
a719a1c563
Holy huge commit with unhelpful name batman!
...
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07:00
modmuss50
87f6ea1eb0
Ic2 recipes?
2016-06-04 20:07:34 +01:00
modmuss50
0bbc088524
No longer shows the RF bar on our machines
2016-06-04 18:20:37 +01:00
modmuss50
207d42d81b
The One Probe support
2016-06-04 14:53:16 +01:00
modmuss50
c968cd3b2e
Update forge
...
Update mappings
Update Tinkers support - Closes #614
2016-06-04 11:31:53 +01:00
modmuss50
96235d2c9d
Uses Reborncores version of MCMP
2016-06-01 12:06:51 +01:00