Tntrololol
|
0bb98b1781
|
Enabled Grinder to take an extra input in place of fluidstack
|
2015-05-24 13:51:41 -05:00 |
|
modmuss50
|
2d17902d03
|
Allow any input or output to be null, includes a fix for the grinder fluid as well
|
2015-05-23 13:54:12 +01:00 |
|
modmuss50
|
46ee2fc71d
|
Initial fix to allow null itemstacks
|
2015-05-23 13:47:25 +01:00 |
|
Tntrololol
|
56e41efd6b
|
Merge remote-tracking branch 'origin/master'
|
2015-05-22 17:37:26 -05:00 |
|
Tntrololol
|
7ad96faa21
|
Added new storage blocks and textures
|
2015-05-22 17:37:10 -05:00 |
|
modmuss50
|
e4c5b1a0da
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-05-22 21:15:29 +01:00 |
|
modmuss50
|
0298621cb9
|
More work on the syncing issues, should be all fixed :)
|
2015-05-22 21:15:19 +01:00 |
|
Tntrololol
|
e9b1280a13
|
Added 5 additional types of machine hulls and their respective textures
|
2015-05-22 15:02:02 -05:00 |
|
modmuss50
|
e930ea2a04
|
Added a central way of limiting the syncs.
Tiles auto sync every 30 seconds
they have a max so they can only sync 2 times a second
|
2015-05-22 08:22:16 +01:00 |
|
Tntrololol
|
cdf8f3e0a3
|
Added GUI elements to the Industrial Grinder
|
2015-05-21 18:04:34 -05:00 |
|
modmuss50
|
74e16510aa
|
added isActive to the crafter
|
2015-05-21 21:27:16 +01:00 |
|
modmuss50
|
9eb7735c10
|
Added comments to the crafter to help people understand it
|
2015-05-21 07:56:01 +01:00 |
|
Gig
|
7b1b131b23
|
Little things
|
2015-05-21 00:42:44 +01:00 |
|
Gig
|
1446237236
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-05-20 23:35:18 +01:00 |
|
Gig
|
4ffa445b9b
|
Fixed Lathe returning on texture all the time
|
2015-05-20 23:35:04 +01:00 |
|
Tntrololol
|
2278e2ab3e
|
Added GUI progress bar to the Chemical Reactor
|
2015-05-20 17:34:41 -05:00 |
|
Tntrololol
|
f32c81c780
|
Merge remote-tracking branch 'origin/master'
|
2015-05-20 16:44:06 -05:00 |
|
Tntrololol
|
4bd43b861c
|
Added GUI progress bar to the Industrial Centrifuge
|
2015-05-20 16:43:46 -05:00 |
|
Gig
|
105c83b288
|
Fixed Conflicting Tiles Closes issue #7
|
2015-05-20 17:00:58 +01:00 |
|
Gig
|
1f93e6a90e
|
Fixed centrifuge returning alloy smelter
|
2015-05-19 23:07:20 +01:00 |
|
Gig
|
cfaabab37a
|
Moved recipe handlers to Api
|
2015-05-19 23:06:52 +01:00 |
|
Gig
|
1f9600b33c
|
Organized imports
Changed centrifuge to new recipe system
|
2015-05-19 23:00:36 +01:00 |
|
Tntrololol
|
6de2cc351a
|
Added plate cutting machine recipes
|
2015-05-18 18:05:49 -05:00 |
|
Tntrololol
|
942c41fe14
|
Added electric lathe recipes
|
2015-05-18 17:12:11 -05:00 |
|
Tntrololol
|
701b6553b6
|
Merge remote-tracking branch 'origin/master'
|
2015-05-17 19:57:34 -05:00 |
|
Tntrololol
|
2007161a16
|
Added remaining assembling machine recipes
|
2015-05-17 19:56:52 -05:00 |
|
Gig
|
20a9cabf93
|
Little clean and format change
|
2015-05-17 22:58:53 +01:00 |
|
Gig
|
ce4312a578
|
Upgrade slots for more machines
|
2015-05-17 19:45:12 +01:00 |
|
Gig
|
ca98541d70
|
Start on hammer
|
2015-05-17 02:16:40 +01:00 |
|
Gig
|
cfc71d48b2
|
Added machine block for stand alone recipes
|
2015-05-17 01:37:03 +01:00 |
|
Tntrololol
|
3b5f80bf77
|
Merge remote-tracking branch 'origin/master'
|
2015-05-16 18:52:15 -05:00 |
|
Tntrololol
|
71e20d4dac
|
Added some assembing machine recipes (not done yet)
|
2015-05-16 18:52:05 -05:00 |
|
Gig
|
0970604d5b
|
Added waila support to more machine
|
2015-05-17 00:44:46 +01:00 |
|
Gig
|
9bc9da2fad
|
Fixed ItemIcons on machines
|
2015-05-16 23:14:17 +01:00 |
|
Gig
|
2163092237
|
added On textures to a load of machines
|
2015-05-16 22:50:11 +01:00 |
|
modmuss50
|
3a89b0446c
|
Added on texture to implosion compressor
|
2015-05-16 22:30:45 +01:00 |
|
modmuss50
|
1726d4c7a3
|
Fixed drainContainers not checking to see if it can fill
|
2015-05-16 21:55:27 +01:00 |
|
modmuss50
|
44a21fd13d
|
Fixed some things
|
2015-05-16 21:30:20 +01:00 |
|
modmuss50
|
d68c63a40d
|
Added fluid crafting, updated buildcraft
|
2015-05-16 20:30:07 +01:00 |
|
modmuss50
|
fd2f5d193a
|
added onCraft, and canCraft
|
2015-05-16 19:40:39 +01:00 |
|
modmuss50
|
9b654eb1de
|
Fixed stack size
|
2015-05-16 19:26:26 +01:00 |
|
modmuss50
|
1b308c56d6
|
Revert "Merge remote-tracking branch 'origin/loadingScreen'"
This reverts commit 5e20dc8156, reversing
changes made to 3e5fc0bbec.
|
2015-05-16 17:45:42 +01:00 |
|
modmuss50
|
5e20dc8156
|
Merge remote-tracking branch 'origin/loadingScreen'
Conflicts:
src/main/java/techreborn/Core.java
|
2015-05-16 17:44:08 +01:00 |
|
modmuss50
|
3e5fc0bbec
|
Massive network performance inprovement.
|
2015-05-16 17:33:50 +01:00 |
|
modmuss50
|
d32b39d8c6
|
Machines no longer require an input in the set slot
|
2015-05-16 17:23:39 +01:00 |
|
modmuss50
|
f7124cb7e6
|
fixed syncing things, and bug with last commit
|
2015-05-16 16:59:36 +01:00 |
|
modmuss50
|
6bd2818e74
|
fixed input stack size
|
2015-05-16 16:55:54 +01:00 |
|
Gig
|
f9074e5b37
|
Added battery and upgrade slots to chemical reactor
|
2015-05-15 17:46:03 +01:00 |
|
Gig
|
83259b0615
|
Fixed Chemical Reactor gui name
|
2015-05-15 17:37:33 +01:00 |
|
Gig
|
44abbfd79f
|
Added missing uurecipes
|
2015-05-15 17:29:12 +01:00 |
|
Gig
|
fc11db09cc
|
Added bucket textures to items
|
2015-05-15 17:05:18 +01:00 |
|
Gig
|
2b652f0502
|
I should remember when I update forge to run gradlew eclipse
|
2015-05-15 16:52:16 +01:00 |
|
Gig
|
ceeda641a6
|
Commented out all doesOreNameExist recipes
|
2015-05-15 16:45:27 +01:00 |
|
Gig
|
f1fd0af052
|
Now checks for ee3
|
2015-05-15 16:27:40 +01:00 |
|
Tntrololol
|
3c0bd5a54f
|
Added remaining alloy smelter recipes
|
2015-05-14 22:19:52 -05:00 |
|
Tntrololol
|
158fdd338a
|
Fixed custom macerator recipes showing up as fire in NEI if ores were not present.
|
2015-05-14 16:03:19 -05:00 |
|
Tntrololol
|
24180fd5b1
|
Merge remote-tracking branch 'origin/master'
|
2015-05-13 17:32:03 -05:00 |
|
Tntrololol
|
fdec643bbb
|
Added bucket textures
|
2015-05-13 17:31:48 -05:00 |
|
Gig
|
55a3acff14
|
Little things for later
|
2015-05-13 22:22:14 +01:00 |
|
Tntrololol
|
5a57dc5817
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 13:26:35 -05:00 |
|
Tntrololol
|
65dd53c6ec
|
Added machine GUI progress bars
|
2015-05-12 13:26:23 -05:00 |
|
Gig
|
bf49bd2136
|
Added upgrade slots to AssemblingMachine
|
2015-05-12 16:05:15 +01:00 |
|
Gig
|
13957467a1
|
Added battery slot and upgrade slots to alloy smelter
|
2015-05-12 15:58:20 +01:00 |
|
Gig
|
a23243cd02
|
Added ChemicalReactor
|
2015-05-12 00:17:17 +01:00 |
|
Gig
|
1de5de9cec
|
Quick fix to platecuttingmachine
|
2015-05-12 00:01:33 +01:00 |
|
Gig
|
f84d9edc06
|
Finish plate cutting machine
|
2015-05-11 23:50:49 +01:00 |
|
Gig
|
2ab94e6030
|
Fixed Lathe recipe handler
|
2015-05-11 23:44:26 +01:00 |
|
Tntrololol
|
c9c5adf4ab
|
Experimenting with GUI progress bars
|
2015-05-11 17:29:37 -05:00 |
|
Tntrololol
|
9f25a41a3d
|
Merge remote-tracking branch 'origin/master'
|
2015-05-11 17:26:34 -05:00 |
|
Tntrololol
|
0818405215
|
Temporarily removed world.isRemote() check to fix crafter sync issue.
|
2015-05-11 17:26:26 -05:00 |
|
Gig
|
0dde18f7e0
|
getting things ready for achievements
|
2015-05-11 23:00:29 +01:00 |
|
Gig
|
1bddb1747f
|
Fix for the ticktime
|
2015-05-11 22:08:32 +01:00 |
|
Tntrololol
|
f3d346f6d1
|
Added fuel rod textures
|
2015-05-11 16:07:02 -05:00 |
|
Tntrololol
|
6a157f880e
|
Merge remote-tracking branch 'origin/master'
|
2015-05-11 15:59:39 -05:00 |
|
Tntrololol
|
438541dfa4
|
Fixed missing textures and localizations
|
2015-05-11 15:59:24 -05:00 |
|
Gig
|
cf1074d637
|
Small tweeks
|
2015-05-11 21:53:47 +01:00 |
|
Gig
|
988747e98a
|
Fixed plate cutting machine not storing inv to nbt
|
2015-05-11 18:04:28 +01:00 |
|
Gig
|
a8a46352c8
|
Added Industrial Sawmill pokes @modmuss50 to look at the nei handler crash issue bet I did it wrong
|
2015-05-11 17:04:27 +01:00 |
|
Gig
|
3fe5605de3
|
quick fix
|
2015-05-11 15:49:58 +01:00 |
|
Gig
|
fa2ebfa639
|
Added ConfigChangedEvent
|
2015-05-10 22:20:20 +01:00 |
|
modmuss50
|
f0fa0c0cdc
|
Fixed Grinder crash on place
|
2015-05-10 21:45:43 +01:00 |
|
modmuss50
|
6648868944
|
Fixed crash when placing matter fab
|
2015-05-10 21:40:24 +01:00 |
|
Tntrololol
|
51071be80c
|
Merge remote-tracking branch 'origin/master'
|
2015-05-10 15:39:27 -05:00 |
|
Tntrololol
|
792ab032ba
|
Fixed/Updated GUIs
|
2015-05-10 15:39:19 -05:00 |
|
modmuss50
|
03cd665add
|
Nei Handlers now show all ores
|
2015-05-10 21:03:48 +01:00 |
|
Gig
|
07be177c6c
|
Changes to aesu
|
2015-05-10 21:02:57 +01:00 |
|
modmuss50
|
9ffce3b355
|
Made some things public
|
2015-05-10 20:51:57 +01:00 |
|
Tntrololol
|
6353f02541
|
Reformat
|
2015-05-10 13:11:46 -05:00 |
|
Gig
|
1db1c02077
|
Added config to heatgen
|
2015-05-10 19:08:02 +01:00 |
|
Gig
|
0011125a2a
|
Changed alloysmelter gui texture to new
|
2015-05-10 19:04:30 +01:00 |
|
Gig
|
e784681b56
|
Added gui/container to alloy furnace
|
2015-05-10 19:00:58 +01:00 |
|
modmuss50
|
88bb4db40f
|
Testing of the ores in nei
|
2015-05-10 18:47:08 +01:00 |
|
Gig
|
808a3056a2
|
Test seems to render fine and look fine can undo later
|
2015-05-10 17:37:39 +01:00 |
|
Gig
|
8c5afc7b5e
|
Fixed fluids not rendering in tanks (dont no why that worked but it did )
|
2015-05-10 17:36:09 +01:00 |
|
Gig
|
0de33330e3
|
Fixed machine opening gui's while being wrenched now players must be sneaking to wrench machine
|
2015-05-10 17:06:08 +01:00 |
|
Gig
|
744a694142
|
Fixed returning wrong tile
|
2015-05-10 16:46:22 +01:00 |
|
Gig
|
ee0844bd0c
|
Added HeatGenerator
|
2015-05-10 16:42:01 +01:00 |
|
Tntrololol
|
350580d76e
|
Merge remote-tracking branch 'origin/master'
|
2015-05-09 18:42:25 -05:00 |
|
Tntrololol
|
60ce6187f1
|
Added another massive amount of localizations
|
2015-05-09 18:42:11 -05:00 |
|
Gig
|
50c2599305
|
Littlie more work on AESU
|
2015-05-09 20:47:05 +01:00 |
|
