Commit graph

2996 commits

Author SHA1 Message Date
Ourten
b688fe72e4 Fix shift-click deleting pre-existing stack 2017-01-06 22:57:40 +01:00
Ourten
728e956d69 Fix merge-shifting bypass of slot filters 2017-01-06 22:39:06 +01:00
ProfessorProspector
6acded92ed The return of Mr. Gui Builder 2017-01-05 21:01:28 -08:00
Ourten
19cdb5b4eb Fix shift-click bypass of slot filters + Remade ChargeBench and ChunkLoader with ContainerBuilder 2017-01-06 02:30:51 +01:00
Ourten
b70d9b41c6 Begin the ContainerBuilder system
Right now it doesn't do much and the internal code is quite ugly.
2017-01-06 00:43:34 +01:00
modmuss50
ebb7578391
Bump version, #releaseBuild 2017-01-05 21:42:10 +00:00
modmuss50
c3fe135498
Fixes issues with red garnets dropping, Closes #871 2017-01-05 21:26:31 +00:00
modmuss50
039cab23eb
Fixes some final issues with ic2 de-duplication, closes #875 2017-01-05 21:22:33 +00:00
ProfessorProspector
56b8b346f0 The Great Refactor of 2017 - make things more abstract 2017-01-05 13:16:51 -08:00
ProfessorProspector
e86c0d175c The Great Refactor of 2017 - More recipes moved over! 2017-01-05 13:14:24 -08:00
modmuss50
a0c3cc644a
Add MissingIngredientExpection 2017-01-05 21:11:44 +00:00
Prospector
c8ebf402af Update README.md 2017-01-04 20:30:38 -08:00
Ourten
11c67f68a9 Fix TechReborn chests inventory capabilities. close #878 2017-01-05 00:17:53 +01:00
ProfessorProspector
2ad33bd6a9 The Great Refactor of 2017 - Remove old Plate Cutting Machine stuff, move UU matter and cable recipes over, fix industrial grinder eu usage, clean up EnumStandaloneCableType, move Fluid Generator, Rolling Machine, Scrapbox, and Smelting recipes over. Add some alternative rolling recipes for metal recipes that are more efficient. 2017-01-04 14:19:41 -08:00
Prospector
1215c47fc2 The Great Refactor of 2017 - Extractor Recipes 2017-01-03 09:32:55 -08:00
modmuss50
eb2453480f
Remove this other event handler, and move it to RC 2017-01-03 15:13:36 +00:00
modmuss50
ab301d25db
Move multiblock event registry to reborn core 2017-01-03 15:04:30 +00:00
Prospector
bd4103b7df The Great Refactor of 2017 - Industrial Centrifuge Recipes 2017-01-03 00:33:25 -08:00
Prospector
3cdc1b73df #betaBuild 2017-01-02 22:25:47 -08:00
Prospector
1831ff4dbc The Great Refactor of 2017 - Implosion Compressor Recipes 2017-01-02 18:00:14 -08:00
modmuss50
345a319d98
WIP changes for updates MineTweaker 2017-01-02 23:41:46 +00:00
Prospector
cf6fbb5ddc Remove debug lines and make tools children of item/handheld. 2017-01-02 15:31:28 -08:00
Prospector
f88f0f3cdb Fix cell outputs and lang 2017-01-02 15:14:09 -08:00
Prospector
c4b003f946 Localize Compressed Air and Electrolyzed Water 2017-01-02 13:24:53 -08:00
Prospector
a29006cae2 Electrolyzed Water recipe 2017-01-02 13:20:57 -08:00
Prospector
8bd1660c41 Remove duplicate recipe and fix bonemeal recipe in electrolyzer 2017-01-02 13:18:37 -08:00
Prospector
206b20ac9e The Great Refactor of 2017: Electrolyzer Edition 2017-01-02 13:08:58 -08:00
Prospector
cc50cf08d5 Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2 2017-01-01 19:33:29 -08:00
Prospector
007c6ca38a Add a use for bauxite and continue the great refactor of 2017 2017-01-01 19:32:53 -08:00
Prospector
18d5650c48 #releaseBuild 2017-01-01 01:18:38 -08:00
Prospector
6a70424252 Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class. 2016-12-31 23:29:32 -08:00
Prospector
6d931b232d Update README.md 2016-12-31 00:37:34 -08:00
Prospector
76ebd84256 Update README.md 2016-12-31 00:36:00 -08:00
ProfessorProspector
c24116e259 Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!) 2016-12-30 23:45:42 -08:00
ProfessorProspector
9b73f20ad0 Fix lazurite plate recipe. not ready for a new build yet 2016-12-30 14:49:31 -08:00
modmuss50
99002697ee
Bump version + reborncore #releaseBuild 2016-12-27 20:08:28 +00:00
modmuss50
51f7de7210
Push to dual versions 2016-12-27 20:04:38 +00:00
modmuss50
b2d070c7f3
Fix compile errors, and bump forge to 1.11.2 2016-12-27 19:47:54 +00:00
modmuss50
0922e0b886
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/IC2Dict.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/init/OreDict.java
2016-12-26 23:49:42 +00:00
ProfessorProspector
415660c988 Tweak how nugget recipes are done once again, and \o/ 2500th commit! 2016-12-22 15:12:13 -08:00
ProfessorProspector
2e9bf11569 Fix nuggets -> ingot recipes 2016-12-22 14:40:24 -08:00
ProfessorProspector
68d5a49d75 Add iridium reinforced stone & tungstensteel block recipes 2016-12-22 14:39:10 -08:00
ProfessorProspector
a446c76397 Add nuggets -> ingot and ingot -> nuggets recipes 2016-12-22 14:33:21 -08:00
Modmuss50
74b9b03dd3 Merge pull request #869 from al132/1.10.2-v1
Fix display slots in Fusion Reactor JEI
2016-12-22 17:35:11 +00:00
al132
8306ebc72c Fix display slots in Fusion Reactor JEI 2016-12-22 11:29:07 -06:00
ProfessorProspector
ed766b0623 #releaseBuild 2016-12-21 17:40:08 -08:00
ProfessorProspector
3162422ee2 remove more debug code 2016-12-21 17:12:24 -08:00
ProfessorProspector
73f362bf76 Actually fix gems ore dict 2016-12-21 17:08:13 -08:00
ProfessorProspector
2ecf8400b8 Fix red garnet drops 2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9 Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860 2016-12-21 16:47:53 -08:00