modmuss50
3f8128d890
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
695ca83896
Fix drill recipes, closes #819
2016-12-07 13:27:20 +00:00
modmuss50
a42cf2990f
Fix recipes, without silicon
2016-12-05 13:04:21 +00:00
modmuss50
463740ac99
Rename method to reflect the 1.11 changes.
2016-12-05 11:19:37 +00:00
modmuss50
d53f4dafc1
Added extra validation to recipe inputs and outputs, fixed one bug because of it.
2016-12-05 11:18:30 +00:00
modmuss50
72f85d5243
Auto format code.
2016-12-05 10:48:21 +00:00
modmuss50
a96c094267
Removed un used block.
2016-12-05 10:21:17 +00:00
modmuss50
8379115c97
Fix Machine Casings
2016-12-05 10:17:39 +00:00
modmuss50
c661f6b278
Fix Machine Casing Model
2016-12-05 10:07:41 +00:00
modmuss50
2fdce5405b
Improve block names
2016-12-05 09:40:55 +00:00
modmuss50
1dbc56f739
Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup).
2016-11-28 13:01:30 +00:00
modmuss50
83ef3e7577
Start of new texturesm, again
2016-11-28 12:54:44 +00:00
modmuss50
e16c3eba02
Auto format
2016-11-25 13:25:51 +00:00
modmuss50
528fecc2b5
Fix a load of null issues, and get it to sort of work.
2016-11-19 16:36:13 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing
2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update
2016-11-19 12:50:08 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
...
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
brad18
f5172ee496
Update ModRecipes.java ( #787 )
...
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes #783
2016-11-06 20:14:29 +00:00
modmuss50
d9d8845d6d
Added flare, still needs some textures
2016-11-06 19:14:43 +00:00
modmuss50
d75120bb00
Give more fluids power values
2016-11-05 17:55:50 +00:00
modmuss50
0dd3b725ce
Fix recipe crash
2016-11-05 16:53:22 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f
2016-11-05 16:33:27 +00:00
ProfessorProspector
31a901cf89
fix another gem thing
2016-11-05 16:25:47 +00:00
ProfessorProspector
3073a19cfa
Fix gem tools and armour recipes
2016-11-05 16:25:32 +00:00
modmuss50
73095ca198
Fix startup crash when adding some recipes.
2016-11-04 20:10:19 +00:00
modmuss50
271a8f2b2b
Fix ingot->dust dupe bug
...
Fix RC version not working in dev
2016-11-04 20:09:35 +00:00
modmuss50
19f1e71ac4
Fix #772
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:07:41 +00:00
3Pixel
3b9e48a345
Fixed the blast Furnace recipe ( #781 )
...
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-11-04 20:05:41 +00:00
3Pixel
e19f1c6ca9
Fixed the blast Furnace recipe ( #781 )
...
does not use superconductors now. instead it uses the same recipe as the 1.9.4 branch which is cupronickel Heating coils instead of superconductors...
2016-10-18 00:14:18 +01:00
modmuss50
fdb506ad15
Remove some config settings that break things, fixes #732
2016-10-08 21:56:24 +01:00
modmuss50
ee9f48bc84
Fix #772
2016-10-08 20:47:22 +01:00
modmuss50
796df6c055
Auto Format code
2016-10-08 20:46:16 +01:00
modmuss50
38f965917f
Fix Start-up crash + new version
2016-09-27 19:34:18 +01:00
modmuss50
0aaa00fd03
Version 1.4.5
2016-09-27 18:31:56 +01:00
modmuss50
f7c2d85a62
Fix #753 Stops invalid items being added to the scrapbox
2016-09-27 18:30:03 +01:00
modmuss50
7b162009c2
Hide Quantum chest and tanks when quantumstorage is loaded
2016-09-27 17:50:34 +01:00
modmuss50
a5550b9bb4
Fix a load of issues
2016-09-19 20:58:34 +01:00
modmuss50
281537a417
Added rubber to ore dic
2016-09-18 20:56:29 +01:00
modmuss50
edf266588f
Fix wrench recipe issues
...
Remove fluid pipe
Add recipe to switch rubber
Fix some missing textures
2016-09-16 22:56:21 +01:00
Zygimantas
bda861454c
fixed #722 ( #729 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
* Fixed #722 with a null ore check
2016-08-10 21:57:38 +01:00
Zygimantas
cf46fea074
Electrolyzer recipes ( #728 )
...
* 3 Pyrite dusts in an Industrial Electrolyzer gives 1 Iron dust and 2 Sulfur dust
* referenced to issue #484 , fixed #1 , #3 , #6 , #7
2016-08-10 20:33:49 +01:00
modmuss50
d96149fc97
Revert "Power system re-write, recipe fixes."
...
This reverts commit d982cc4028
.
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-08-10 00:51:44 +01:00
modmuss50
8a0d981018
Revert "Fusion reactor fixes & rewrite, energy fixes."
...
This reverts commit 06fad2264f
.
2016-08-10 00:30:08 +01:00
modmuss50
22fd152ec9
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
...
This reverts commit be4f10b975
.
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
Dragon2488
f03fbef70e
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-08-01 21:00:30 +07:00
Dragon2488
42d051cda3
Veins ore generation + fixes.
2016-08-01 20:59:20 +07:00
modmuss50
cb44c79256
Remove needed block, update forge
2016-08-01 09:37:55 +01:00
Dragon2488
7f02559357
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn
2016-07-29 01:52:08 +07:00
Dragon2488
5af14bbf01
Grinder recipes fixes and auto-generation for ores, gems and ingots through ore dictionary
2016-07-29 01:28:59 +07:00
laz2727
99057a8e8e
Fix Tinkers Construct crashing
...
Probably.
2016-07-25 20:27:33 +04:00