modmuss50
|
33985f1a31
|
Revert "Added code formatter"
This reverts commit b9448d5d90 .
|
2016-03-24 00:41:47 +00:00 |
|
modmuss50
|
b9448d5d90
|
Added code formatter
|
2016-03-24 00:39:26 +00:00 |
|
modmuss50
|
a1078a4951
|
Added WIP tool tip
|
2016-03-23 18:59:39 +00:00 |
|
modmuss50
|
ab19d71ede
|
Moved shields to RebornCore
|
2016-03-22 20:30:59 +00:00 |
|
modmuss50
|
4f3d9ddfca
|
Shields
|
2016-03-21 19:36:54 +00:00 |
|
modmuss50
|
d66c2e8301
|
Added debug items
|
2016-03-20 16:43:25 +00:00 |
|
gigabit101
|
2fa00b9c7f
|
little fixs
|
2016-03-19 23:18:31 +00:00 |
|
modmuss50
|
8c24711d4f
|
Optimise imports
|
2016-03-15 08:13:05 +00:00 |
|
modmuss50
|
7f920b282f
|
Optimise imports to make it easier to find and replace package names
|
2016-03-13 15:37:55 +00:00 |
|
TheDoctorSoda
|
38af4881b4
|
Started nanosaber, needs work but wanted to get the item in.
|
2016-03-06 23:01:02 -08:00 |
|
gigabit101
|
02ac62a180
|
Started Recycler
|
2016-03-06 23:15:28 +00:00 |
|
gigabit101
|
3302d63385
|
Added lapatron and energy crystals
|
2016-03-05 22:50:39 +00:00 |
|
modmuss50
|
5e82463330
|
Initial port of cables from kotlin
|
2016-03-02 16:29:51 +00:00 |
|
TheDoctorSoda
|
9e5f223a42
|
Added jackhammers
|
2016-02-28 11:18:59 -08:00 |
|
TheDoctorSoda
|
74caaf6bd6
|
Made chainsaws share code
|
2016-02-27 16:49:50 -08:00 |
|
modmuss50
|
e4b8918224
|
More work on the cables, and add items
|
2016-02-27 19:36:01 +00:00 |
|
modmuss50
|
7ef16b475b
|
Idea broke the imports, here is the fix
|
2016-02-26 21:51:34 +00:00 |
|
modmuss50
|
e8539eadd3
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-02-26 21:47:16 +00:00 |
|
modmuss50
|
9507c92d94
|
Added wrench
|
2016-02-26 21:46:55 +00:00 |
|
gigabit101
|
6549282ea0
|
Cleaned up imports
|
2016-02-26 13:03:30 +00:00 |
|
TheDoctorSoda
|
4efb322ccd
|
Fix drill tier and charge configs and add chainsaws
|
2016-02-25 17:42:24 -08:00 |
|
gigabit101
|
82d2de7eb1
|
Start on the new manual
|
2016-02-25 18:25:52 +00:00 |
|
gigabit101
|
3274894625
|
Added hammer and some basic plate recipes
|
2016-02-25 14:16:08 +00:00 |
|
modmuss50
|
46cdf8f587
|
Fixes to configs, optimise imports.
|
2016-02-24 08:18:21 +00:00 |
|
gigabit101
|
b613b1e419
|
Drills
|
2016-02-20 23:04:32 +00:00 |
|
gigabit101
|
0522e9539f
|
Added some textures
Added Tree Tap
Added Tree Tap logic
|
2016-02-20 22:50:24 +00:00 |
|
modmuss50
|
71c2bfee7f
|
Moved power system to RC and spawn trees in groups
|
2016-02-20 16:59:31 +00:00 |
|
gigabit101
|
f947ef37a4
|
Added basic battery and fixed issues with Lithium Battery
|
2016-02-20 03:35:20 +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
|
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
|
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
|
0d4b9afd01
|
All Items now have textures
|
2015-11-27 20:17:12 +00:00 |
|
Modmuss50
|
30879a534a
|
859
|
2015-11-23 19:19:18 +00:00 |
|
Modmuss50
|
f0a70fa478
|
5235
|
2015-11-23 14:40:30 +00:00 |
|
Modmuss50
|
7e07320844
|
Removed unused imports
|
2015-11-12 19:50:20 +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
|
cd32fe255c
|
Added ore dic for gems back, fixes #188
|
2015-10-12 07:54:28 +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
|
363adeb681
|
why was this done twice
|
2015-10-09 22:06:35 +01:00 |
|