maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1571 commits 1 branch 0 tags 80 MiB
Commit graph

1378 commits

Author SHA1 Message Date
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
gigabit101
f8ca41a9ce Closes #294 2016-02-19 23:33:18 +00:00
modmuss50
6636fc648b Initial work on rubber trees 2016-02-19 20:58:23 +00:00
modmuss50
c9fad62ed2 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-19 20:32:35 +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
mezz
a1ef232b38 Update JEI, minor clean up of JEI integration 2016-02-17 23:44:15 -08: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
c0ebf03f72 fixes #326 2016-02-16 09:20:26 +00:00
modmuss50
840f524350 Quick fix for #329 2016-02-16 09:11:13 +00:00
The-Fireplace
efccf62690 Update BlockOre.java 
Conflicts:
	src/main/java/techreborn/blocks/BlockOre.java
 2016-02-16 09:08:07 +00:00
modmuss50
bf691fd8a6 Fixes #313 2016-02-16 09:07:22 +00:00
modmuss50
99d69f3cbb Update to new RF API, closes #335 2016-02-10 13:15:02 +00:00
The-Fireplace
0d35ecb70f Update BlockOre.java 2016-02-06 14:18:47 -06:00
modmuss50
b3bec47b11 Fixes #313 2016-02-06 11:51:55 +00:00
modmuss50
99756b355f Fixes #328 2016-02-06 11:48:37 +00:00
modmuss50
4585684fe2 Removed bucket textures as it now generates them at runtime 2016-02-02 21:22:51 +00:00
modmuss50
8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update 2016-02-02 21:05:42 +00:00
mezz
e4af69e861 Update JEI & Forge, add recipe click areas and rolling machine transfer 2016-02-01 17:59:23 -08:00
modmuss50
c2562ac7b3 Update JSONDestroyer 2016-02-01 15:06:14 +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
f7ccd07b1a Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemFluidbucket.java
 2016-01-22 13:40:47 +00:00
modmuss50
7e7ad74203 Squashed commit of the following: 
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
 2016-01-22 13:39:20 +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
006b611fa3 Fix another merge error 2016-01-16 13:16:55 +00:00
modmuss50
415531587b Fix incorrect merge 2016-01-16 13:11:08 +00:00
modmuss50
2a617919d9 Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9 
# Conflicts:
#	src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
#	src/main/java/techreborn/tiles/TileBlastFurnace.java
 2016-01-16 13:09:09 +00:00
modmuss50
b7023f3114 Merge remote-tracking branch 'remotes/origin/master' into 1.7.10 2016-01-16 13:06:43 +00:00
gigabit101
77bfbc46f8 closes #311 2016-01-16 04:32:58 +00:00
gigabit101
1ed3d226f2 Closes #320 2016-01-16 04:27:17 +00:00
modmuss50
692c89a6a0 Fixes #327 2016-01-13 17:17:53 +00:00
modmuss50
eca3534d1e fixes #324 2016-01-13 15:41:30 +00:00
modmuss50
7139a62102 Update to fixed Reborn core and bump version 2016-01-13 13:40:02 +00:00
modmuss50
2b54516bdd Fixes #321 - And I tested it so I know it works 2016-01-09 11:41:16 +00:00
modmuss50
be2f5f9e52 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-07 10:46:33 +00:00
modmuss50
b588e8c08a IC2 Classic API support (This is all you are getting) 
If this is broken I dont care, if it has broken other things I will care.
 2016-01-07 10:46:13 +00:00
mezz
a00543c67d Update to latest JEI 2016-01-06 00:46:23 -08:00
modmuss50
ee86b97429 Fixed issue with RF not working as expected 2016-01-05 18:12:13 +00:00
modmuss50
7ecdd27752 Start work on porting from the MT script 2016-01-03 19:07:31 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
modmuss50
7e12e3acbf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-01-01 20:36:12 +00:00
modmuss50
cf800a905b Fixes #309 and might help #314 2016-01-01 20:35:58 +00:00
mezz
686dd71caf Add rolling machine recipes 2015-12-31 03:20:04 -08:00
mezz
090de63608 Add Vacuum Freezer recipes 2015-12-31 02:27:07 -08:00
mezz
ad0b45cd2a Add industrial sawmill recipes 2015-12-31 02:11:24 -08:00
mezz
123042a069 Refactor setting recipe items for JEI 2015-12-31 02:10:57 -08:00
mezz
3fde850448 Add Industrial Electrolyzer recipes 2015-12-31 01:40:56 -08:00
mezz
ef1ee67c06 Change blast furnace recipe in JEI to crop out the power icon 2015-12-31 01:26:26 -08:00
mezz
6ce72c8339 Fix oreDict support for recipes in JEI 2015-12-31 01:25:54 -08:00
mezz
aed7b5c0c4 Add implosion compressor recipes 2015-12-31 01:07:35 -08:00
mezz
5addee32e6 Add grinder recipes 2015-12-31 00:56:09 -08:00
mezz
c187f931ce Add chemical reactor recipes 2015-12-30 23:30:09 -08:00
mezz
bb82e2cfb2 Add centrifuge recipes 2015-12-30 23:13:02 -08:00
mezz
ff571d5444 Add blast furnace recipes 2015-12-30 22:28:58 -08:00
mezz
05d8a5c787 Add assembling machine recipes 2015-12-30 22:28:39 -08:00
mezz
4b804c3521 Add alloy furnace recipes 2015-12-30 21:17:20 -08:00
mezz
202555b4ac Add RecipeTransferHandler for FusionReactor 2015-12-30 20:20:36 -08:00
mezz
181498e132 Clean up JEI Integration 2015-12-30 20:09:06 -08:00
modmuss50
1c28fa6e0a Revert "Disable BOP support to try and fix gradle crash" 
This reverts commit 13f3d5757f.
 2015-12-30 23:57:06 +00:00
modmuss50
c791bcdeb5 update to new RebornCore 2015-12-30 23:25:36 +00:00
modmuss50
13f3d5757f Disable BOP support to try and fix gradle crash 2015-12-30 17:17:16 +00:00
modmuss50
54817286e6 Revert "test to fix build issue" 
This reverts commit eed1a7a719.
 2015-12-30 17:09:17 +00:00
modmuss50
0c7f07001b temp remove jei support to track down build issue. 2015-12-30 17:06:24 +00:00
modmuss50
895d5cfdd9 1.8.9 update 2015-12-30 11:57:06 +00:00
modmuss50
d973d6b108 Added back some more compat 2015-12-28 10:57:22 +00:00
modmuss50
df213bc22a Merge branch '1.8.8' of https://github.com/TechReborn/TechReborn into 1.8.8 2015-12-23 12:43:53 +00:00
modmuss50
2320ceb2c3 Fixed machines loosing state 2015-12-23 12:40:48 +00:00
Modmuss50
13d3d475fd Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-18 19:39:43 +00:00
modmuss50
5821dbfe0e Added config to CompatManager to allow disabling of handlers. 2015-12-18 19:17:11 +00:00
Modmuss50
f17cd36815 Update merged commits to 1.8.8 2015-12-16 17:13:17 +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
741c25a5a2 Standalone recipes! 2015-12-16 17:04:37 +00:00
Modmuss50
0c80f2beda More recipes, work on #182 2015-12-16 16:40:47 +00:00
Modmuss50
eedabb9e7d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/tiles/TileGrinder.java
 2015-12-16 16:06:33 +00:00
Modmuss50
96a7b56b5f Fixes #304 2015-12-16 15:56:12 +00:00
Modmuss50
5324016199 fixes #302 2015-12-16 11:07:34 +00:00
Modmuss50
fbc5291a1d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-14 18:14:12 +00:00
Modmuss50
23255bdfff Fixes #301 2015-12-14 18:13: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
08c0e2d81e Fixes #299 2015-12-14 11:06:25 +00:00
Modmuss50
efd19336bf Revert "Load TechReborn before RebornCore might help with #299" 
This reverts commit a1194698cb.
 2015-12-14 08:31:39 +00:00
Modmuss50
a1194698cb Load TechReborn before RebornCore might help with #299 2015-12-14 08:24:13 +00:00
Modmuss50
abcaccdc82 Added waila support back 2015-12-13 19:41:46 +00:00
modmuss50
3b3deea57b update things 2015-12-13 13:29:15 +00:00
Modmuss50
d64928b4e4 Added more null checks, might fix #297 2015-12-12 11:48:34 +00:00
Modmuss50
d5ce5cba04 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 
# Conflicts:
#	src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
 2015-12-12 11:41:21 +00:00
Modmuss50
cc6dfbc3c4 Fixes #295 2015-12-11 21:52:35 +00:00
Modmuss50
5c95b238fa Fixes #296 2015-12-11 21:33:32 +00:00
Modmuss50
31f1786f6d Updated JEI 2015-12-11 20:07:38 +00:00
Modmuss50
9bb3aad137 Update to new RebornCore 2015-12-11 19:48:16 +00:00
modmuss50
801964a92d Bumped required forge version 2015-12-06 15:02:05 +00:00
modmuss50
f7477f5496 Removed fluid sources from creative tab. 2015-12-06 10:35:37 +00:00
modmuss50
ba90e49822 updated JEI, and improved support 2015-12-05 22:48:11 +00:00
modmuss50
40f78c3938 Merge branch 'master' into 1.8.8 
Conflicts:
	build.gradle
 2015-12-05 20:30:20 +00:00
modmuss50
cf36bc9dc1 Fixes #293 and removed java doc 2015-12-05 20:23:40 +00:00
modmuss50
a795f90971 Update forge, fix ticking tiles. 2015-12-05 20:14:32 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
modmuss50
3fb7dd102b Inital Just Enough Items support 2015-11-29 10:42:34 +00:00
modmuss50
3367e990be Update to new forge and mappings 2015-11-29 09:52:45 +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
94a2229ed7 All block textures now work 2015-11-27 19:54:34 +00:00
modmuss50
1475554f8e Bundle the ic2 wrench api 2015-11-27 19:21:52 +00:00
Modmuss50
52af3d2d2d Removed null recipes 2015-11-27 13:15:19 +00:00
Modmuss50
285176e171 Large handfull of textures. 2015-11-26 21:48:30 +00:00
Modmuss50
7370784c7f More textures 2015-11-26 20:43:56 +00:00
Modmuss50
869e6d4bf8 Fixed compile errors 2015-11-26 19:33:52 +00:00
Modmuss50
b0784c44d2 Fixes for latest forge and more rendering. 2015-11-26 17:35:31 +00:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
f12725b4e0 Fixed charge hud, and clocking device. 2015-11-25 08:28:28 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
0bb1375823 Added cell rendering 2015-11-24 21:39:22 +00:00
Modmuss50
90628fad02 It runs 2015-11-23 20:37:20 +00:00
Modmuss50
bce444a4ff 0 2015-11-23 20:34:05 +00:00
Modmuss50
fe9d41ac76 50 2015-11-23 20:27:06 +00:00
Modmuss50
51d07ac8f5 571 2015-11-23 20:03:07 +00:00
Modmuss50
839647ed85 734 2015-11-23 19:51:40 +00:00
Modmuss50
ef82ceb714 790 2015-11-23 19:37:39 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
b88fe49ee2 1936 2015-11-23 18:41:29 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
abb9b5102f 2731 2015-11-23 14:49:35 +00:00
Modmuss50
fa9cd98b5a 4693 2015-11-23 14:47:50 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
modmuss50
3db2db3c7c Small fix. 2015-11-22 16:27:15 +00:00
modmuss50
7bcc793d12 Added javaDoc and updated deps 2015-11-22 16:24:50 +00:00
modmuss50
d545521d04 Added PlayerDectector closes #286 2015-11-22 11:16:54 +00:00
modmuss50
05e7ecf2f3 Removed sout lines 2015-11-22 10:33:21 +00:00
modmuss50
48a7f1cc6d Fixes #290 2015-11-22 10:27:33 +00:00
Modmuss50
d928472d84 Fixes #219 2015-11-21 08:54:26 +00:00
Modmuss50
2c31b9211c Started work on the player detector. 2015-11-18 20:59:08 +00:00
Modmuss50
08cbe33f00 Fixes #263 2015-11-18 20:14:46 +00:00
Modmuss50
276bf8355f Computer Cube now shows PDA gui 2015-11-18 19:51:41 +00:00
Modmuss50
806cf757a5 Fixes #264 2015-11-18 19:41:37 +00:00
Modmuss50
0f09088813 Fixes #282 2015-11-18 18:36:00 +00:00
Modmuss50
a47b1b1f27 Fixes #281 2015-11-18 18:35:03 +00:00
Modmuss50
3f41e26ece Fixes some issues with the fustion reactor. 2015-11-18 17:02:22 +00:00
Gigabit101
885a6ad76d Merge pull request #276 from Mazdallier/patch-2 
Update fr_FR.lang
 2015-11-18 16:42:00 +00:00
Modmuss50
93d1ff57b7 Fixed in world multiblock preview 2015-11-18 11:10:03 +00:00
Modmuss50
758d918bdb Got the Vacuum Freezer working. 2015-11-18 08:35:34 +00:00
Modmuss50
8fd59c896b Fixes #277 2015-11-18 08:29:51 +00:00
Modmuss50
3114576e7b Most of the Vacuum Freezer(Not working just yet) 2015-11-17 21:48:06 +00:00
Modmuss50
219f2a0df7 Quick Fix for MT Scripts 2015-11-17 18:19:12 +00:00
Modmuss50
96492bd87e Fixes #275 again 2015-11-17 13:31:34 +00:00
Modmuss50
5e079afd05 Small fix to reactor MT support 2015-11-17 11:20:58 +00:00
Modmuss50
9283e46a1f Fixes #275 and added world placement helper for reactor 2015-11-17 11:12:58 +00:00
Mazdallier
6efa1de164 Update fr_FR.lang 
all done
 2015-11-17 10:22:27 +01:00
Modmuss50
8c85aeb4d3 Added minetweaker support for Fusion Reactor 2015-11-17 08:24:41 +00:00
Modmuss50
50a45560ab Fixes #274 and Fixes #268 2015-11-17 07:52:47 +00:00
Modmuss50
3fc8587200 Added info to the gui 2015-11-16 21:51:14 +00:00
Modmuss50
7db2e0dc8c Polish to the reactor 2015-11-16 21:50:09 +00:00
Modmuss50
b506c2e091 Added NEI support for fusion reactor 2015-11-16 21:24:10 +00:00
Modmuss50
a63128aa7e Added Fusion Reactor 2015-11-16 21:10:39 +00:00
Modmuss50
473a981f51 Hot fix 0.6.1 and Fusion Reactor API 2015-11-16 20:27:45 +00:00
Modmuss50
1321422edf Fixes #273 2015-11-16 19:01:27 +00:00
Modmuss50
f42c127201 Added basic fustion reactor multiblock checking. 2015-11-16 15:20:19 +00:00
Mazdallier
81b45789ac Update fr_FR.lang 
big update to continuous line 695
 2015-11-16 15:40:43 +01:00
Modmuss50
100293fb8e Started work on reactor. 2015-11-16 13:36:44 +00:00
Modmuss50
19d269b1de Fixes #271 2015-11-16 11:17:36 +00:00
Modmuss50
9b1378a64c Fixes #269 2015-11-15 21:12:31 +00:00
Modmuss50
df5bd1422a Fixes #267 2015-11-15 20:54:31 +00:00
Modmuss50
78a7bcf4bc Recoded MT support 2015-11-15 20:51:54 +00:00
modmuss50
16f1a8de17 Charge bench recode. 2015-11-13 19:00:17 +00:00
gigabit101
421597fbab Added missing localizations closes #242 2015-11-13 16:48:51 +00:00
gigabit101
cc2b6a8df3 All machines can now be powered with batteries 2015-11-13 16:40:01 +00:00
gigabit101
0ebf0c95dd more charge slots 2015-11-13 16:29:35 +00:00
gigabit101
a74910e763 Some work on charge slots 2015-11-13 16:08:50 +00:00
Modmuss50
1551164cd6 Some work on recoding MT support 2015-11-13 13:18:48 +00:00
Modmuss50
bb2914bf5d Fix imports 2015-11-13 08:28:32 +00:00
Modmuss50
de1d036b33 Revert "Fixes #219 Potentialy breaking for MT scripts." 
This reverts commit f326dbfec9.
 2015-11-13 08:27:02 +00:00
Modmuss50
a7001bbfd7 Revert "fixes #219 again" 
This reverts commit d562e1222a.
 2015-11-13 08:26:51 +00:00
Modmuss50
2331e3c35d Fixes #255 and fixes #258 2015-11-12 21:38:11 +00:00
Modmuss50
61a600713a Charge bench now supports higher teir items. 2015-11-12 21:28:49 +00:00
gigabit101
c4b50b5c79 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 21:01:53 +00:00
gigabit101
da631dd25e Fixed Isidedness of Centrifuge closes #262 2015-11-12 21:01:36 +00:00
Modmuss50
08a3636e72 Fixes #260 2015-11-12 21:00:03 +00:00
gigabit101
a499cf2b09 Removed fake output slot from rolling machine closes #259 2015-11-12 20:50:58 +00:00
gigabit101
322cc072a8 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-11-12 20:46:44 +00:00
gigabit101
4d6f961b9c Fixed Implosion Compressor gui closes #261 2015-11-12 20:46:37 +00:00
Modmuss50
c0665e5c80 Fixes #257 2015-11-12 20:41:01 +00:00
gigabit101
320d06e39e Fixed Digital Chest not counting the ItemStack in output slot 2015-11-12 20:22:41 +00:00
gigabit101
d9654782fe Fixed stack issue with Quantum/Digital Chest 2015-11-12 20:12:15 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
5419067213 Work for #242 2015-11-12 08:32:14 +00:00
Modmuss50
d562e1222a fixes #219 again 2015-11-12 08:22:47 +00:00
gigabit101
c2dcaf1902 Fixed Quantum Chest/Digital Chest stored items closes #247 2015-11-11 21:37:31 +00:00
Modmuss50
9b6383a548 fixes #251 2015-11-11 18:38:43 +00:00
Modmuss50
25158d872f Removed explosions when raining 2015-11-11 18:33:15 +00:00
Modmuss50
351d7afadb Update reborn core 2015-11-11 17:37:14 +00:00
Modmuss50
85e7bfacde Added ore unifier, disbled by defualt. 2015-11-11 17:25:55 +00:00
Modmuss50
c120c37723 Fixes #250 2015-11-11 17:12:59 +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
8f45d418e3 Fixes crafting for lapotronicOrb 2015-11-11 16:50:28 +00:00
Modmuss50
2dd4e93f41 Cleaned up ore recipes, closes #241 2015-11-11 16:46:50 +00:00