modmuss50
|
0cf477dd89
|
Some small changes and fixes.
|
2016-02-20 21:01:14 +00:00 |
|
modmuss50
|
1f59226e01
|
Add some stuff, that does things
|
2016-02-20 19:46:18 +00:00 |
|
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
|
defde302fe
|
Added machine block recipe last commit for night
|
2016-02-20 03:57:15 +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 |
|
modmuss50
|
cfab240ac7
|
Added some more items
|
2016-02-20 01:32:08 +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
|
9268fa4d55
|
1117 lines of new recipes?
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
|
2016-02-19 20:32:26 +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 |
|
modmuss50
|
25777b3f96
|
Fixes #217
|
2016-02-16 10:00:03 +00:00 |
|
modmuss50
|
bf691fd8a6
|
Fixes #313
|
2016-02-16 09:07:22 +00:00 |
|
modmuss50
|
b3bec47b11
|
Fixes #313
|
2016-02-06 11:51:55 +00:00 |
|
modmuss50
|
8ec95f9119
|
Now using new Forge Dynamic buckets, and prep for new update
|
2016-02-02 21:05:42 +00:00 |
|
modmuss50
|
3909a868aa
|
Revert "Revert "Fix bucket issues""
This reverts commit d5b880387a .
# Conflicts:
# src/main/java/techreborn/items/tools/ItemFluidbucket.java
|
2016-01-22 17:41:47 +00:00 |
|
modmuss50
|
d5b880387a
|
Revert "Fix bucket issues"
This reverts commit 43768b9310 .
|
2016-01-16 17:50:18 +00:00 |
|
modmuss50
|
43768b9310
|
Fix bucket issues
|
2016-01-16 15:54:41 +00:00 |
|
modmuss50
|
b242ec5c5f
|
Cut all the things!
|
2016-01-02 01:40:11 +00:00 |
|
modmuss50
|
cf800a905b
|
Fixes #309 and might help #314
|
2016-01-01 20:35:58 +00:00 |
|
Modmuss50
|
0fdba82490
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
# src/main/java/techreborn/compat/CompatManager.java
|
2015-12-16 17:10:25 +00:00 |
|
Modmuss50
|
0c80f2beda
|
More recipes, work on #182
|
2015-12-16 16:40:47 +00:00 |
|
Modmuss50
|
7c48afa63c
|
Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
|
2015-12-14 17:47:28 +00:00 |
|
Modmuss50
|
6df6dbfdf5
|
Fixes #300
|
2015-12-14 17:45:06 +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
|
0d4b9afd01
|
All Items now have textures
|
2015-11-27 20:17:12 +00:00 |
|
Modmuss50
|
52af3d2d2d
|
Removed null recipes
|
2015-11-27 13:15:19 +00:00 |
|
Modmuss50
|
b0784c44d2
|
Fixes for latest forge and more rendering.
|
2015-11-26 17:35:31 +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
|
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
|
2c31b9211c
|
Started work on the player detector.
|
2015-11-18 20:59:08 +00:00 |
|
Modmuss50
|
3114576e7b
|
Most of the Vacuum Freezer(Not working just yet)
|
2015-11-17 21:48:06 +00:00 |
|
Modmuss50
|
a63128aa7e
|
Added Fusion Reactor
|
2015-11-16 21:10:39 +00:00 |
|
Modmuss50
|
f42c127201
|
Added basic fustion reactor multiblock checking.
|
2015-11-16 15:20:19 +00:00 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +00:00 |
|
Modmuss50
|
08b570ea36
|
Fixes #244
|
2015-11-11 17:08:41 +00:00 |
|
Modmuss50
|
842fa421ae
|
Fixes #243
|
2015-11-11 17:00:18 +00:00 |
|
Modmuss50
|
2dd4e93f41
|
Cleaned up ore recipes, closes #241
|
2015-11-11 16:46:50 +00:00 |
|
Modmuss50
|
f4a3e87ebb
|
Fixes #233
|
2015-11-11 15:54:19 +00:00 |
|
Modmuss50
|
faa1d079cd
|
Added a handfull of recipes for #182
|
2015-11-11 11:21:10 +00:00 |
|
Modmuss50
|
3799eb3eb2
|
Work for #182
|
2015-11-11 08:33:05 +00:00 |
|
modmuss50
|
d4222693c0
|
Cleaned up Item Power System
|
2015-11-08 13:59:36 +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
|
a8c9b71e47
|
Some work on the ore Unifier, for #225
|
2015-11-07 09:12:44 +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 |
|
Modmuss50
|
cd32fe255c
|
Added ore dic for gems back, fixes #188
|
2015-10-12 07:54:28 +01:00 |
|
modmuss50
|
a34a005b7b
|
Fixes #183
|
2015-10-10 16:45:12 +01:00 |
|
gigabit101
|
891a5f5d19
|
closes 179
|
2015-10-09 22:19:38 +01:00 |
|
gigabit101
|
e1db33dd8a
|
Missed one
|
2015-10-09 22:13:08 +01:00 |
|
gigabit101
|
935a8bc382
|
Removed more junk
|
2015-10-09 22:11:04 +01:00 |
|
gigabit101
|
363adeb681
|
why was this done twice
|
2015-10-09 22:06:35 +01:00 |
|
gigabit101
|
0f089c79e6
|
removed un needed ore dict stuff
|
2015-10-09 22:04:54 +01:00 |
|
gigabit101
|
fd4ecbb6d2
|
closes #184
|
2015-10-09 21:59:20 +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
|
9c3bc97af2
|
Fixes #162, sorry if it breaks some of your tiles.
|
2015-10-06 20:39:19 +01:00 |
|
Modmuss50
|
081f16a533
|
Removed Farm
|
2015-09-23 18:58:46 +01:00 |
|
Modmuss50
|
3f4b59faaf
|
Fixes #130
|
2015-09-23 17:27:41 +01:00 |
|
modmuss50
|
dec36fd47d
|
Added new method to check if ore is valid. Fixes #150
|
2015-09-19 19:16:43 +01:00 |
|
Modmuss50
|
1a47b56345
|
Fixes #143
|
2015-09-15 18:33:32 +01:00 |
|
Modmuss50
|
2b4daf86bb
|
Fixes #145
|
2015-09-15 08:30:30 +01:00 |
|
modmuss50
|
8aafd118f5
|
Added fluid power manager, imports from forestry and bc
|
2015-09-08 18:39:59 +01:00 |
|
modmuss50
|
72799a9474
|
Added some fuels to forestry's api, might write our own and import bc's and forest into ours.
|
2015-09-08 13:26:24 +01:00 |
|
modmuss50
|
cb59fff1f0
|
fixes #126 and fixes #127
|
2015-08-26 09:52:56 +01:00 |
|
modmuss50
|
103c0b79e4
|
fixes #119
|
2015-08-26 00:44:44 +01:00 |
|
modmuss50
|
0154f5a21a
|
Fixes #124
|
2015-08-26 00:35:04 +01:00 |
|
modmuss50
|
4d87a27509
|
fixes #118
|
2015-08-26 00:27:12 +01:00 |
|
modmuss50
|
fdc6ccf2a0
|
fixes #122
|
2015-08-26 00:20:32 +01:00 |
|
modmuss50
|
6fa53f2884
|
fixes #212
|
2015-08-26 00:17:04 +01:00 |
|
modmuss50
|
a7154f5056
|
fixes #117
|
2015-08-25 18:43:18 +01:00 |
|
modmuss50
|
da538c7d77
|
fixes #125
|
2015-08-25 18:38:50 +01:00 |
|
modmuss50
|
364d2d68db
|
Fixed #103
|
2015-08-16 11:50:37 +01:00 |
|
modmuss50
|
00dad58c6d
|
Fixed some recipes
|
2015-08-16 11:19:25 +01:00 |
|
modmuss50
|
404bbf6797
|
Fixed #101
|
2015-08-09 16:45:17 +01:00 |
|
modmuss50
|
e0ab0af822
|
Reformatted all the code using the default intelji formatting options.
|
2015-08-09 11:05:32 +01:00 |
|
modmuss50
|
56c747bb93
|
Should help with the storage block recipes
|
2015-08-05 15:51:35 +01:00 |
|
modmuss50
|
9e346e6061
|
Added machine parts, added some recipes. Fixes #92
|
2015-08-05 15:35:06 +01:00 |
|
gigabit101
|
4c2c69f84e
|
Added cloaking device {WIP}
|
2015-08-04 21:12:27 +01:00 |
|
modmuss50
|
07c9ee97d4
|
Added test recipe for blast furnace
|
2015-07-25 15:32:20 +01:00 |
|
gigabit101
|
5636dc373f
|
closes #79
|
2015-07-24 21:54:18 +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 |
|
modmuss50
|
bb98d76eea
|
Fixed incorrect storage block recipes
|
2015-07-23 09:30:38 +01:00 |
|
modmuss50
|
29398d50dd
|
Added Farm inventory cable
|
2015-07-14 17:18:00 +01:00 |
|
modmuss50
|
b6807d249d
|
Some major tweaks to the part system, broken old cables!
|
2015-07-14 16:45:45 +01:00 |
|
modmuss50
|
5d574e0540
|
Some more work on the tree farm
|
2015-07-13 20:54:32 +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
|
1a3cd0c54e
|
fixes #78
|
2015-07-11 18:19:08 +01:00 |
|
modmuss50
|
a48dab6dfa
|
Fixed ruby to steel
|
2015-07-11 18:12:06 +01:00 |
|
gigabit101
|
91c9a28796
|
Removed ruby to ruby dust recipe close #69
|
2015-07-06 16:52:12 +01:00 |
|
gigabit101
|
179ae2ca42
|
Now use oredict for plateIridium closes #74
|
2015-07-06 16:41:17 +01:00 |
|
gigabit101
|
26eff9bcbf
|
Removed fluid tank from IndustrialElectrolyzer closes #58
|
2015-07-02 23:39:36 +01:00 |
|