Commit graph

350 commits

Author SHA1 Message Date
modmuss50
0ac86ff303 Added sapling 2016-02-20 18:40:35 +00:00
modmuss50
71c2bfee7f Moved power system to RC and spawn trees in groups 2016-02-20 16:59:31 +00:00
modmuss50
891d2cce32 Added rubber processing 2016-02-20 10:58:58 +00:00
gigabit101
ee2841b5b1 Added machine blocks 2016-02-20 03:47:35 +00:00
gigabit101
f947ef37a4 Added basic battery and fixed issues with Lithium Battery 2016-02-20 03:35:20 +00:00
gigabit101
047625389d Added compressor, extractor, electric furnace 2016-02-20 03:07:56 +00:00
gigabit101
cd13932bde Basic generator just needs logic 2016-02-20 02:21:44 +00:00
gigabit101
464d8cac03 Added advancedCircuit and Circuit 2016-02-20 01:08:18 +00:00
gigabit101
aa41d576e3 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-20 00:58:02 +00:00
gigabit101
8ad4a45716 Added basic Grinder 2016-02-20 00:57:57 +00:00
modmuss50
a76384504f Rubber Trees 2016-02-20 00:55:18 +00:00
modmuss50
9a585bcfb2 Merge branch '1.7.10' into 1.8.9
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/BlockOre.java
	src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
The-Fireplace
efccf62690 Update BlockOre.java
Conflicts:
	src/main/java/techreborn/blocks/BlockOre.java
2016-02-16 09:08:07 +00:00
The-Fireplace
0d35ecb70f Update BlockOre.java 2016-02-06 14:18:47 -06:00
modmuss50
8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update 2016-02-02 21:05:42 +00:00
modmuss50
c2562ac7b3 Update JSONDestroyer 2016-02-01 15:06:14 +00:00
modmuss50
7e7ad74203 Squashed commit of the following:
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
2016-01-22 13:39:20 +00:00
modmuss50
692c89a6a0 Fixes #327 2016-01-13 17:17:53 +00:00
modmuss50
2b54516bdd Fixes #321 - And I tested it so I know it works 2016-01-09 11:41:16 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
modmuss50
7e12e3acbf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-01 20:36:12 +00:00
modmuss50
cf800a905b Fixes #309 and might help #314 2016-01-01 20:35:58 +00:00
modmuss50
c791bcdeb5 update to new RebornCore 2015-12-30 23:25:36 +00:00
Modmuss50
08c0e2d81e Fixes #299 2015-12-14 11:06:25 +00:00
Modmuss50
9bb3aad137 Update to new RebornCore 2015-12-11 19:48:16 +00:00
modmuss50
f7477f5496 Removed fluid sources from creative tab. 2015-12-06 10:35:37 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
modmuss50
3367e990be Update to new forge and mappings 2015-11-29 09:52:45 +00:00
modmuss50
d5e2628f7a Some small tweaks 2015-11-28 12:51:49 +00:00
modmuss50
6679c595c5 Some attempts at getting fluid to render. 2015-11-27 20:41:02 +00:00
modmuss50
94a2229ed7 All block textures now work 2015-11-27 19:54:34 +00:00
Modmuss50
285176e171 Large handfull of textures. 2015-11-26 21:48:30 +00:00
Modmuss50
7370784c7f More textures 2015-11-26 20:43:56 +00:00
Modmuss50
b0784c44d2 Fixes for latest forge and more rendering. 2015-11-26 17:35:31 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
bce444a4ff 0 2015-11-23 20:34:05 +00:00
Modmuss50
839647ed85 734 2015-11-23 19:51:40 +00:00
Modmuss50
ef82ceb714 790 2015-11-23 19:37:39 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
modmuss50
d545521d04 Added PlayerDectector closes #286 2015-11-22 11:16:54 +00:00
modmuss50
05e7ecf2f3 Removed sout lines 2015-11-22 10:33:21 +00:00
Modmuss50
2c31b9211c Started work on the player detector. 2015-11-18 20:59:08 +00:00
Modmuss50
08cbe33f00 Fixes #263 2015-11-18 20:14:46 +00:00
Modmuss50
276bf8355f Computer Cube now shows PDA gui 2015-11-18 19:51:41 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +00:00
Modmuss50
7db2e0dc8c Polish to the reactor 2015-11-16 21:50:09 +00:00
Modmuss50
f42c127201 Added basic fustion reactor multiblock checking. 2015-11-16 15:20:19 +00:00
Modmuss50
19d269b1de Fixes #271 2015-11-16 11:17:36 +00:00
Modmuss50
2331e3c35d Fixes #255 and fixes #258 2015-11-12 21:38:11 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
842fa421ae Fixes #243 2015-11-11 17:00:18 +00:00
Modmuss50
1618a5ca6d Work for #243 The charge bench has no texture 2015-11-11 13:20:03 +00:00
modmuss50
ef03cf50a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
Modmuss50
e3da8073ed Fixes #222 2015-11-02 15:18:10 +00:00
modmuss50
bffbd31cab Sort of Revert "why was this done twice"
This reverts commit 363adeb681.

Fixes #209
2015-11-01 16:24:35 +00:00
gigabit101
fcc09445a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-01 16:04:52 +00:00
gigabit101
e0c99b8ef7 fixed Quantum tank dropping fluid items when broken closes #210 2015-11-01 16:04:41 +00:00
modmuss50
5b57f7f909 Fixes blocks not dropping correctly. 2015-11-01 15:58:34 +00:00
modmuss50
d4607706b8 Fixes #213 2015-11-01 14:33:04 +00:00
modmuss50
a74154688c Fixes #190 2015-10-17 20:21:43 +01:00
gigabit101
a8ea0f55e7 Removed a load of un needed junk from other versions of Gtech 2015-10-09 21:55:54 +01:00
Modmuss50
8a494a392c Fixes #172 2015-10-08 08:24:48 +01:00
Modmuss50
9c52e0ace7 Fixes #170 and fixes #167 2015-10-07 08:34:24 +01:00
modmuss50
e257c424e2 Quick fix for crash, full fix coming tomorrow 2015-10-06 22:57:38 +01:00
modmuss50
b0c77d4d22 Fixed server crash 2015-10-03 20:29:02 +01:00
modmuss50
c30633b5d3 Added config for disabling connected textures 2015-10-02 21:09:57 +01:00
Modmuss50
f5c31a6a31 Added connected textures for the lesu 2015-09-26 16:13:42 +01:00
Modmuss50
d942e6f52e Added connected textures to advanced machine casing. 2015-09-26 15:47:54 +01:00
Modmuss50
fcec162559 inital connected textures, still needs some work. 2015-09-26 13:54:58 +01:00
Modmuss50
bc5d9cf88b Started work on custom connected texture system
This will make the textures at runtime, so we will only need to have 2
sprites to do it
2015-09-26 09:16:08 +01:00
Modmuss50
081f16a533 Removed Farm 2015-09-23 18:58:46 +01:00
modmuss50
148715111f Renamed TileMeta to TileRotation 2015-09-19 09:31:24 +01:00
modmuss50
aacc73102d Fixed small issue with get tile meta 2015-09-19 09:27:13 +01:00
modmuss50
5d5f4ec929 Fixes #149 2015-09-19 09:23:39 +01:00
Modmuss50
29d47ec37e Fixes #141 2015-09-14 21:23:07 +01:00
modmuss50
67e6182e44 Fixed centrifuge block icons 2015-09-07 21:17:07 +01:00
Modmuss50
fe11409b4e Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles 2015-09-05 11:44:41 +01:00
Modmuss50
d3e860edb2 Inital port to tile based meta 2015-09-05 09:17:58 +01:00
modmuss50
cb59fff1f0 fixes #126 and fixes #127 2015-08-26 09:52:56 +01:00
modmuss50
fb33dda932 Changes the way heat is calculated. 2015-08-10 14:32:01 +01:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
9e346e6061 Added machine parts, added some recipes. Fixes #92 2015-08-05 15:35:06 +01:00
gigabit101
7905573e23 Fixed Quantum chests and tanks not having a hardness 2015-08-04 20:50:58 +01:00
modmuss50
5927eaca4c Recoded idsu, closes #81 2015-07-26 16:01:27 +01:00
modmuss50
8725c5932d It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items. 2015-07-23 16:19:07 +01:00
gigabit101
ab72f7dced Started adding progress bars to other machines 2015-07-21 17:53:43 +01:00
modmuss50
c160abf176 Started work on the farm, some changes to the idsu, its still broken 2015-07-13 13:54:44 +01:00
modmuss50
be33bdc148 Fixes #80 2015-07-12 16:51:14 +01:00
modmuss50
ab384b661a Fixed lesu issue, temp remove rf output 2015-07-03 17:12:31 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
bfe0d57bc7 Started on ChargeBench only slot 0 works atm 2015-06-29 18:03:40 +01:00
modmuss50
d53a2aeef1 Added rendering back, fixed lag issues with cables 2015-06-28 19:02:31 +01:00
joflashstudios
c15302a789 Cleaned up and automated some recipe stuff
Correct recipes to and from storage blocks are now available. The old wrong ones still need to be removed (e.g. sapphires to chrome block.)
2015-06-26 02:09:45 -04:00
joflashstudios
0f6747f703 Updated getByName functions
Added storage block functions
Fixed a bunch of getX() typeos
2015-06-25 18:41:29 -04:00
Gig
7ba9cad072 increase ores hardness 2015-06-24 14:12:30 +01:00
Gig
49a359f178 blast furnace gui should still open even if there is no multiblock 2015-06-20 21:54:08 +01:00
Gig
5d9c273743 Massive cleanup on the fluids 2015-06-20 21:34:03 +01:00
modmuss50
45783b55f1 Fixes #38 on new ic2's 2015-06-19 18:07:15 +01:00
Gig
52deb162ff Fixes closes #39 2015-06-19 00:56:07 +01:00
modmuss50
9d16b13d6e initial work on making it work, now to fix the broken gui 2015-06-18 18:34:39 +01:00
modmuss50
598badc375 A load of work on the system, seams a lot is broken. 2015-06-17 17:01:26 +01:00
joflashstudios
54904b223f Fixed oredrops
Fixes #36
2015-06-17 00:27:44 -04:00
modmuss50
70fb58f704 work on the gui list 2015-06-16 13:38:46 +01:00
modmuss50
2bed98e6f0 Added basic test cases for the IDSU manager, it looks like it works :) 2015-06-15 21:18:12 +01:00
Gig
f5aecc07cc Fixed derpy textures 2015-06-14 18:29:27 +01:00
modmuss50
c9c664352c Finished the lesu 2015-06-14 16:42:03 +01:00
modmuss50
2ded7e0121 Added lesu logic. updated fmp to allow extra utils to run 2015-06-14 15:58:49 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
modmuss50
755c64369a Fixed fluid syncing issues, fixed liquid item dropping when block broken 2015-06-14 11:58:56 +01:00
Tntrololol
df7199d113 Gave the Industrial Sawmill a front texture 2015-06-11 15:06:21 -05:00
modmuss50
871a6a6a9d Fixed as not outputting until hit with a wrench 2015-06-10 20:48:17 +01:00
Gig
4f800c8a83 Added basic tile for metalShelf 2015-06-08 20:51:08 +01:00
modmuss50
a94085229d Moved OreDrop
With a small bit of work we could make an api to get the config values,
then this could go in the api
2015-06-08 17:44:29 +01:00
joflashstudios
02fce02d7b Said goodbye to RecipeHanderer
A bunch of ModRecipes fixes
2015-06-08 10:45:21 -04:00
joflashstudios
86726d57c4 Fixed indention. IntelliJ can be obnoxious. 2015-06-08 01:45:49 -04:00
joflashstudios
f082fe5b2a Add the rest of the ores to the OreDrop API 2015-06-08 01:41:44 -04:00
joflashstudios
00d2f5f8fd OreDrop fixes
Fixes 2 issues.

1/100 block breaks, a non-fortune tool grants an extra item

Bug that breaks drops if the base count is > 1
2015-06-08 01:41:15 -04:00
joflashstudios
ace69fc5be Tweaked OreDrop constructor
baseChance is now exposed to the rest of the world as a double, since it was just an error waiting to happen when somebody enters the % chance as stack size or vice versa.
2015-06-08 01:06:56 -04:00
joflashstudios
999567e6df We no longer need to distinguish between primary and secondary, since we are now using [ArrayList<ItemStack> getDrops()].
We could possibly just get rid of the class altogether, but it keeps BlockOre's code significantly cleaner.
2015-06-08 00:46:51 -04:00
joflashstudios
8ca4950b02 Added ruby and sapphire ore drops. 2015-06-08 00:31:28 -04:00
joflashstudios
601812a10c Added OreDrop API 2015-06-07 23:55:58 -04:00
joflashstudios
d3c2929807 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-07 15:55:54 -04:00
joflashstudios
2f59ca1b84 Added computercube and lapotronic energy orb 2015-06-07 15:55:23 -04:00
Gig
f240604c4a Fixed Derp.... 2015-06-07 20:47:44 +01:00
Gig
a8962929cc Fixed small derp 2015-06-07 20:45:53 +01:00
Gig
b1cbec9e63 Added Grinder on textures 2015-06-07 20:41:06 +01:00
Gig
70cd363656 On Icons for a load of machines 2015-06-07 19:39:21 +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
af65c885b1 Added proper textures to heat generator 2015-06-07 13:05:53 -05:00
joflashstudios
92af5a1537 Fixed Digital Chest texture 2015-06-07 01:26: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
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
modmuss50
4d76a3071d My mind is blown :D Not sure whats up 2015-06-06 21:41:41 +01:00
Gig
3114dc9194 Machines now return machine blocks unless wrenched 2015-06-06 20:55:02 +01:00
Gig
b423ffd1a5 Gem ores now return gems 2015-06-06 19:54:39 +01:00
joflashstudios
48dd12aa5a Added gas turbine. Still missing recipe and some config elements. 2015-06-05 16:24:52 -04:00
joflashstudios
81273e33ad Added Semifluid generator. Suffers from issue #19 as well. 2015-06-04 23:34:04 -04: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
6185bcd694 added speedMultiplier to the crafter 2015-05-30 11:27:15 +01:00
modmuss50
7dced713ba Some small changes 2015-05-29 17:13:03 +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