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
bbef813fe5
thanks idea for importing the best imports, fixes build
2018-08-02 19:09:11 +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
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
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
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
60873481f3
Unused anymore.
2018-07-13 18:04:50 +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
drcrazy
30302e241b
Fixed charging \ discharging items items. Closes #1547
2018-06-20 18:27:58 +03:00
modmuss50
0e857e8b70
Fix #1546
2018-06-16 16:37:17 +01: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
dace0e56d0
Show required stacks when building fusion reactor
2018-06-10 11:36:21 +01:00
modmuss50
169fa646fb
Add slot config to iron furnace, fixes #1536
2018-06-08 18:46:50 +01:00
drcrazy
2fb4c4559e
Removed unused variable
2018-05-30 17:01:56 +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
drcrazy
ed9cdc7353
GUI update for assembly machine. Some work for #1512
2018-05-08 18:05:49 +03:00
modmuss50
790c363c03
Remove last direct GL class
2018-04-28 19:46:15 +01:00
drcrazy
649a6bf67f
More sorting work.
2018-04-27 18:15:56 +03:00
modmuss50
7f8dff1dd0
Don't clear the button list in random places, also fixes #1494
...
Im not too sure why the button list is added to and cleared every frame, but this is a quick fix to something that should really be changed around at some point. Hopefully this fixes more than it breaks.
2018-04-22 13:40:58 +01:00
modmuss50
99404f8a46
Remove old code
2018-04-21 16:04:59 +01:00
modmuss50
4734c49a70
Fix #1493
2018-04-21 15:53:54 +01:00
modmuss50
53ce1828d1
Small tweaks
2018-04-18 17:33:11 +01:00
modmuss50
5c81430c4c
Finish off the reactor changes, feel free to suggest some more tweaks to it.
2018-04-18 17:15:33 +01:00
modmuss50
09a75893e4
Add larger fusion reactor sizes
2018-04-18 15:46:56 +01:00
modmuss50
d94eb03a06
Update Fusion reactor to use new method for coil location.
2018-04-18 14:48:19 +01:00
modmuss50
3805285356
Fix #1484
2018-04-14 00:18:13 +01:00
modmuss50
65695b86c1
Add copy / pasting of slot configs.
2018-04-12 19:27:11 +01:00
drcrazy
fef10740ba
Feature/fluidreplicator ( #1482 )
...
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
modmuss50
f9d99aad1d
Fix power tool tip being behind heat bar
2018-04-05 15:43:19 +01:00
modmuss50
c17f232bf8
Add gui and packets for locking the rolling machine. #1412
2018-04-05 10:31:22 +01:00
modmuss50
a8d180f146
Add energy change per tick
2018-04-03 17:00:04 +01:00
modmuss50
adb12ef43d
Overclocker upgrades give more power input/storage to machine + add some more info to the tool tip in the gui
...
Also fix for not calling update client side lower down the chain
2018-04-03 16:32:04 +01:00
drcrazy
45361a6b46
Last piece of refactoring due to TileGenericMachine intro.
2018-04-02 18:12:58 +03:00
drcrazy
54ee781bc7
More refactoring for tier1 machines.
2018-04-02 16:58:03 +03:00
drcrazy
80e36f0427
Fixed typos for tier1 tiles folder. New abstract TR machine class
2018-04-02 16:18:48 +03:00
modmuss50
b5ad12a4bb
Update rolling machine to use new gui system. Work towards #1412
2018-03-29 11:52:57 +01:00
modmuss50
4b1a1b796b
Allow upgrade item to stack to 16 (Still stacks to 1 in machine) + Fix potential loss of items when shift clicking.
2018-03-20 17:49:13 +00:00
drcrazy
111ee7630a
Updated API reference for recipes.
2018-03-05 14:45:23 +03:00
modmuss50
9c7f1995a8
Update year in license
2018-02-11 14:08:13 +00:00