Commit graph

2000 commits

Author SHA1 Message Date
ProfessorProspector
2de0ba95a6
Add ruby ore dropping garnets based on ore dict, not the ore itself. Closes #595
# Conflicts:
#	src/main/java/techreborn/Core.java
2016-11-05 16:27:17 +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
c9ff3330ca
Fix #794, fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks 2016-11-05 15:10:28 +00:00
modmuss50
916913337b
Fix #789 2016-11-05 10:43:00 +00:00
modmuss50
9af69638e2
Fix #793 2016-11-05 10:39:13 +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
modmuss50
96d20b7147
No longer regen ores.hjson should fix #778 2016-11-04 20:04:44 +00:00
modmuss50
cff4878eb0
Fix rubber sapling finding top most block of world to grow from. Fixes #782 2016-11-04 20:04:27 +00:00
modmuss50
603c12590d
Update to support RC 2.8 2016-11-04 20:03:05 +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
871edce960
Fix some CME's in the powernet, and add a basic profiler to it, might add a command or someway to use this without enabling it in the code 2016-10-08 20:47:04 +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
ac05373963 Fix #752 Jackhammer now works on all vanilla stone types 2016-09-27 18:27:40 +01:00
modmuss50
0cfb337809 Fix #751 fix creation of invalid machine block itemstacks 2016-09-27 18:24:38 +01:00
modmuss50
7b162009c2 Hide Quantum chest and tanks when quantumstorage is loaded 2016-09-27 17:50:34 +01:00
way2muchnoise
fb6feac92f update to JEI 3.11 (#757) 2016-09-27 17:03:57 +01:00
modmuss50
a5550b9bb4 Fix a load of issues 2016-09-19 20:58:34 +01:00
modmuss50
0f8bb12fea Fix missing gui textures 2016-09-19 20:21:47 +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
modmuss50
0a2e878b88 Fix #738 2016-09-07 08:21:42 +01:00
modmuss50
aefe9f6a36 Merge branch '1.10.2' of https://github.com/TechReborn/TechReborn into 1.10.2 2016-09-06 22:16:29 +01:00
modmuss50
d5ff2a42bb Fixes #723 and wrench works with ic2 machines now 2016-09-06 22:16:21 +01:00
Nagisa·Jang
bd55547918 Update zh_CN.lang (#735) 2016-08-28 10:25:43 +01:00
Utoc
2ae38dea9e Slot index changes (#734)
Changes slot index values to allow machines to be pulled from.
2016-08-27 08:02:44 +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
aa05d906f9 Revert "Wires now transfer energy from all mods and manages it as EU. (#686)"
This reverts commit 6f54e3801f.

# Conflicts:
#	src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2016-08-10 00:45:33 +01:00
modmuss50
cdae866b2d Revert "Rewrite to use new RebornCore Power API. Texture fixes."
This reverts commit b292fdd352.

# Conflicts:
#	src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
#	src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
#	src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
#	src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloySmelter.java
#	src/main/java/techreborn/tiles/TileAssemblingMachine.java
#	src/main/java/techreborn/tiles/TileImplosionCompressor.java
#	src/main/java/techreborn/tiles/TileIndustrialSawmill.java
#	src/main/java/techreborn/tiles/TileVacuumFreezer.java
#	src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
#	src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileCompressor.java
#	src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
#	src/main/java/techreborn/tiles/teir1/TileExtractor.java
#	src/main/java/techreborn/tiles/teir1/TileGrinder.java
#	src/main/java/techreborn/tiles/teir1/TileRecycler.java
2016-08-10 00:45:07 +01:00
modmuss50
9b882e75ce Revert "Bump version number & small NPE fix."
This reverts commit 8a053117c6.

# Conflicts:
#	build.gradle
2016-08-10 00:32:43 +01:00
modmuss50
e3384e3266 Revert "Small order fix."
This reverts commit 74e0c3669f.
2016-08-10 00:30:23 +01:00
modmuss50
575773a6b3 Revert "RF wires fix."
This reverts commit fe64b8ccf7.
2016-08-10 00:30:16 +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
Nico
5f5c43ab96 Added new textures + translation optimizations (#711)
* Added new textures + translation optimizations

* Removed old textures

* Added new textures
2016-08-03 21:39:04 +01:00
Nagisa·Jang
3fea177b1f fix the mistakes (#712) 2016-08-02 14:59:41 +01:00
Nico
9a73c3321e First few Fixes (#707)
* Fixed missing translations

The Plates were only typos...

* Removed old textures

* Added new textures

* Fixed typo for texture
2016-08-02 00:35:00 +01:00
modmuss50
bbc5a636f1 Added ore vein config 2016-08-01 15:30:55 +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