modmuss50
|
8187708e03
|
Fixed on/off textures when power runs out
|
2015-06-07 19:22:17 +01:00 |
|
modmuss50
|
439a877ace
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-07 19:11:26 +01:00 |
|
modmuss50
|
8122d25877
|
Added wrench rotation to the aesu.
|
2015-06-07 19:11:08 +01:00 |
|
Tntrololol
|
d9e219054e
|
Merge remote-tracking branch 'origin/master'
|
2015-06-07 13:06:08 -05:00 |
|
Tntrololol
|
af65c885b1
|
Added proper textures to heat generator
|
2015-06-07 13:05:53 -05:00 |
|
modmuss50
|
23bf14b37d
|
Clean the sawmill gui a bit, and remove debug code
|
2015-06-07 18:58:31 +01:00 |
|
modmuss50
|
c401f614d3
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-07 18:22:43 +01:00 |
|
modmuss50
|
950f556770
|
Fixed issue when not enough imports are present.
|
2015-06-07 18:22:31 +01:00 |
|
Gig
|
bf2054d0a7
|
Fixed Import
|
2015-06-07 18:17:39 +01:00 |
|
modmuss50
|
089f5500e6
|
removed unneeded debug code
|
2015-06-07 14:27:19 +01:00 |
|
modmuss50
|
3605fa7f66
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-07 14:21:25 +01:00 |
|
modmuss50
|
06c21d2668
|
this was the issue all along
This would be the easy fix to my last commit.
|
2015-06-07 11:11:07 +01:00 |
|
modmuss50
|
efba3f247d
|
added IInventory to all machines
|
2015-06-07 09:38:12 +01:00 |
|
modmuss50
|
1ac6f592f8
|
Fixes #25
|
2015-06-07 09:31:58 +01:00 |
|
modmuss50
|
94803e88f3
|
attempt at fixing the item stack size issue
|
2015-06-07 09:21:37 +01:00 |
|
joflashstudios
|
92af5a1537
|
Fixed Digital Chest texture
|
2015-06-07 01:26:37 -04:00 |
|
joflashstudios
|
123c12ae45
|
Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers.
|
2015-06-07 01:02:45 -04:00 |
|
joflashstudios
|
26e71488dd
|
Revert "Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers."
This reverts commit d9494c31fb.
|
2015-06-07 00:45:15 -04:00 |
|
joflashstudios
|
d9494c31fb
|
Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers.
|
2015-06-07 00:41:20 -04:00 |
|
joflashstudios
|
9fa01eaee2
|
Added helpers for the rest of the item types
|
2015-06-07 00:36:37 -04:00 |
|
joflashstudios
|
b950105578
|
Created BlockOre helpers to make recipes more readable.
These works the same as the ItemParts helpers from e00ba942f8
|
2015-06-07 00:13:41 -04:00 |
|
joflashstudios
|
e00ba942f8
|
Created ItemParts helpers to make recipes more readable.
This makes recipes easier to both write and understand, because I don't have to wonder what ModItems.parts #8 is, I can just see "dataOrb."
|
2015-06-06 23:52:51 -04:00 |
|
joflashstudios
|
31bf279afe
|
Added QuantumTank, QuantumChest, DigitalChest, and ComputerMonitor recipes
|
2015-06-06 23:39:48 -04:00 |
|
joflashstudios
|
7cfaac1f61
|
Added Digital Chest, Computer Monitor
|
2015-06-06 22:11:13 -04:00 |
|
Gig
|
65bd203791
|
All machines will drop Inventory after they Implement IInventory
|
2015-06-07 00:00:15 +01:00 |
|
Gig
|
03c1556935
|
Clean this b4 people kill me
|
2015-06-06 23:20:30 +01:00 |
|
modmuss50
|
c6dc2e2810
|
Clean up of code
|
2015-06-06 22:51:06 +01:00 |
|
joflashstudios
|
2ed801eeb2
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-06 17:36:49 -04:00 |
|
joflashstudios
|
202c562936
|
Adding fix for #19 to semifluid and thermal generators.
|
2015-06-06 17:36:45 -04:00 |
|
modmuss50
|
972efc4481
|
A commit, it might be the answer to everything
|
2015-06-06 21:59:54 +01:00 |
|
modmuss50
|
37258cb84c
|
Removed vanilla multipart compact. (This is why I love modularisation)
|
2015-06-06 21:56:55 +01:00 |
|
modmuss50
|
b45711f3f1
|
A fix that works :) (I hope)
|
2015-06-06 21:53:24 +01:00 |
|
modmuss50
|
0bd8d3e42b
|
fix import
|
2015-06-06 21:44:32 +01:00 |
|
modmuss50
|
4d76a3071d
|
My mind is blown :D Not sure whats up
|
2015-06-06 21:41:41 +01:00 |
|
joflashstudios
|
ee798923f5
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-06 15:58:37 -04:00 |
|
joflashstudios
|
b01399f2b5
|
Fixed helium coolant cell textures.
|
2015-06-06 15:57:53 -04:00 |
|
Gig
|
3114dc9194
|
Machines now return machine blocks unless wrenched
|
2015-06-06 20:55:02 +01:00 |
|
joflashstudios
|
71c445d1ed
|
Fixed tetrahedrite ore texture. This gets rid of the different texture per-side feature, because it's incompatible with the ore texture loader we're using. I don't think it's worth writing custom code just so tetrahedrite can have more than one texture.
|
2015-06-06 15:37:52 -04:00 |
|
joflashstudios
|
4c018dc7ad
|
Added textures for all TechReborn fluids.
|
2015-06-06 15:34:54 -04:00 |
|
Gig
|
b423ffd1a5
|
Gem ores now return gems
|
2015-06-06 19:54:39 +01:00 |
|
modmuss50
|
9ee06aed89
|
Fix saying with gas turbine
|
2015-06-06 09:07:23 +01:00 |
|
modmuss50
|
6f80bf7e72
|
Initial port of fluid gui code to nei. Needs some rearraning
|
2015-06-06 09:04:56 +01:00 |
|
modmuss50
|
56619a0ac4
|
Fixed grinder not syncing, started work on the nei handler for it, will add the fluid for it in a bit
|
2015-06-06 08:01:24 +01:00 |
|
Modmuss50
|
28d618632e
|
Merge pull request #23 from joflashstudios/master
Added gas turbine. Still missing recipe and some config elements.
|
2015-06-06 07:53:24 +01:00 |
|
modmuss50
|
379b6a96da
|
finished fixing #19
|
2015-06-06 07:52:00 +01:00 |
|
modmuss50
|
8a1f0a18cd
|
Fixed crash when saving not, fixes saving items, fixes #19
|
2015-06-06 07:32:20 +01:00 |
|
joflashstudios
|
48dd12aa5a
|
Added gas turbine. Still missing recipe and some config elements.
|
2015-06-05 16:24:52 -04:00 |
|
joflashstudios
|
0a965d0b5e
|
Added support for biofuel, bioethanol, and fuel to the semifluid generator, using the eu values from http://ftbwiki.org/Semifluid_Generator_%28IndustrialCraft_2%29
|
2015-06-05 10:17:58 -04:00 |
|
joflashstudios
|
55521b22b1
|
Revert "Added biofuel, bioethanol, and fuel support to semifluid generator."
This reverts commit eb1bd68a95.
|
2015-06-05 10:16:05 -04:00 |
|
joflashstudios
|
eb1bd68a95
|
Added biofuel, bioethanol, and fuel support to semifluid generator.
|
2015-06-05 10:05:55 -04:00 |
|
joflashstudios
|
81273e33ad
|
Added Semifluid generator. Suffers from issue #19 as well.
|
2015-06-04 23:34:04 -04:00 |
|
modmuss50
|
0749385e49
|
About to give up. Here is what ive got.
|
2015-06-01 21:29:39 +01:00 |
|
modmuss50
|
34530fa6ca
|
Improve part server peformance
|
2015-06-01 21:08:28 +01:00 |
|
modmuss50
|
31574f2cdd
|
Some fixes, some breakages
|
2015-05-31 18:54:58 +01:00 |
|
modmuss50
|
0419c0dfa6
|
Fixed progress bar outputs
|
2015-05-31 11:10:43 +01:00 |
|
modmuss50
|
1e656b26e7
|
Now sync to the client side tile, not the container.
|
2015-05-31 10:45:08 +01:00 |
|
Gig
|
17ed2d163d
|
Ores can now be silk tuched
Started on ores returning ItemGems
TODO finish
|
2015-05-31 01:59:43 +01:00 |
|
modmuss50
|
90df1fe398
|
only adds emc values for recipes with one output
|
2015-05-30 13:49:48 +01:00 |
|
modmuss50
|
9075692951
|
Added basic ee3 support for all machines, will not work right when it has two outputs
|
2015-05-30 11:47:01 +01:00 |
|
modmuss50
|
309321dbdc
|
Added powerMultiplier
|
2015-05-30 11:31:00 +01:00 |
|
modmuss50
|
6185bcd694
|
added speedMultiplier to the crafter
|
2015-05-30 11:27:15 +01:00 |
|
modmuss50
|
edabf79b1e
|
Moved all the machines to the new way of handling the packets
|
2015-05-30 11:14:00 +01:00 |
|
modmuss50
|
0f321e2426
|
Fixed isactive
|
2015-05-30 08:53:39 +01:00 |
|
Gig
|
cb541661ad
|
Realigned Nei handler to implosion compressor slots
|
2015-05-30 02:45:16 +01:00 |
|
Gig
|
83d6613f94
|
End ore will now only generate in the End
|
2015-05-30 02:42:43 +01:00 |
|
modmuss50
|
18eed2bf0a
|
fixes #17
|
2015-05-29 21:54:56 +01:00 |
|
modmuss50
|
7dced713ba
|
Some small changes
|
2015-05-29 17:13:03 +01:00 |
|
modmuss50
|
c5e73c6fc3
|
Moved over to the vanilla packet system.
|
2015-05-29 17:00:17 +01:00 |
|
modmuss50
|
3b56d7c1e1
|
should fix the texture no updating, not sure why this broke
|
2015-05-28 09:54:08 +01:00 |
|
modmuss50
|
cd00ebc4fe
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-05-27 14:45:06 +01:00 |
|
modmuss50
|
cf8628cd2a
|
Fixed inputs not being used
|
2015-05-27 14:44:48 +01:00 |
|
Yves
|
8c2d626729
|
Update fr_FR.lang
waitting for testing your mod after this last (but not least) update.
|
2015-05-27 13:55:25 +02:00 |
|
modmuss50
|
046b7d7375
|
added it for all the machines, can you test? Im about to give up on it ;(
|
2015-05-27 12:28:13 +01:00 |
|
modmuss50
|
bed71bd732
|
This should be the end of it, was so close to giving up
|
2015-05-27 12:22:14 +01:00 |
|
modmuss50
|
8055546675
|
Trying to fix the sync issue
|
2015-05-27 12:19:11 +01:00 |
|
Yves
|
64a82a11b4
|
Update fr_FR.lang
this is the turn off all small ans tiny dust, ingot and nugget, ore crushed, rod and plate
|
2015-05-27 12:09:01 +02:00 |
|
Tntrololol
|
4ce6b21d03
|
Fixed grinder allowing any type of fluid into its tank
|
2015-05-26 23:28:12 -05:00 |
|
Tntrololol
|
6ddc05e998
|
Added/fixed some grinder recipes
|
2015-05-26 15:13:13 -05:00 |
|
modmuss50
|
d6a1c9724b
|
Fixed disappearing items
|
2015-05-26 17:29:01 +01:00 |
|
Yves
|
54677cad5e
|
Create fr_FR.lang
|
2015-05-26 14:54:49 +02:00 |
|
Tntrololol
|
e62ba4d440
|
Fixed crash with cross mod grinder recipes
|
2015-05-25 23:26:54 -05:00 |
|
Tntrololol
|
a5691aff9a
|
Fix recipe conflict with Mekanism
|
2015-05-25 22:21:12 -05:00 |
|
Tntrololol
|
10b13d9adc
|
Added Industrial Grinder Recipes
|
2015-05-25 21:17:59 -05:00 |
|
Tntrololol
|
37ba159fa1
|
Fixed storage block ore dictionary registrations
|
2015-05-25 12:37:51 -05:00 |
|
Tntrololol
|
ade8f68acb
|
Added Metal Former Recipes
|
2015-05-25 12:10:20 -05:00 |
|
Tntrololol
|
fceb417fe2
|
Added Industrial Centrifuge Recipes
|
2015-05-25 00:20:59 -05:00 |
|
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 |
|
