Commit graph

2666 commits

Author SHA1 Message Date
modmuss50
9a7ffce98e
Nerf windmill recipes, closes #1154 2017-07-01 11:57:02 +01:00
modmuss50
a952ad1fff
Fixes iron furnace sideded issues, closes #1166 2017-07-01 11:52:33 +01:00
modmuss50
0388f97873
Revert: Small improvements to the cables 2017-06-30 13:17:06 +01:00
modmuss50
2774407307
Fix solar panel recipe 2017-06-30 13:07:46 +01:00
modmuss50
3e5f02ab4e
Small improvements to the cables 2017-06-29 17:19:34 +01:00
modmuss50
5203ad5b01
Debug tool supports FU 2017-06-29 16:44:49 +01:00
modmuss50
81aee77869
Fix energy storage blocks not rotating 2017-06-29 16:03:22 +01:00
modmuss50
4207532ded
Fixes https://github.com/TechReborn/TechReborn/issues/1160 2017-06-29 15:49:34 +01:00
modmuss50
ae71797d28
Draw default background on GUI's might help fix some issues 2017-06-29 13:11:59 +01:00
modmuss50
9edbdf5016
Closes https://github.com/TechReborn/TechReborn/issues/1158 for now 2017-06-29 12:56:33 +01:00
modmuss50
0d4fced8bb
Fixes https://github.com/TechReborn/TechReborn/issues/1159 2017-06-29 12:50:23 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items 2017-06-29 12:37:06 +01:00
modmuss50
774fec221e
Auto format code 2017-06-28 20:54:12 +01:00
modmuss50
c0aab7f37a
Update crafttweaker support 2017-06-28 20:50:00 +01:00
modmuss50
425a8d2948
Remove 2nd pass of mixin loading, and attempt to fix mixin loading outside dev 2017-06-28 09:15:22 +01:00
modmuss50
36e85c82a3
Update to support reborn core mixin changes. 2017-06-26 23:00:43 +01:00
modmuss50
ac7a4246f6
Fixes the auto crafting table, as it broke a bit with the forge update. 2017-06-26 22:30:13 +01:00
modmuss50
f2c753cf1d
Update to new forge, #releaseBuild 2017-06-26 09:40:58 +01:00
modmuss50
f56ffa9eed
Fix a bunch of issues with recipes 2017-06-25 14:15:01 +01:00
modmuss50
a774b2bcb2
Update to support forge model changes, #releaseBuild 2017-06-25 13:56:39 +01:00
modmuss50
ba644982fe
Update to support new forge registry system 2017-06-24 20:15:49 +01:00
Nourepide
c8dfcb3ba5 Fix missing names in JEI (#1149)
* Fix missing names in GUI machines

* Fix missing names in JEI
2017-06-23 14:05:44 +01:00
Nourepide
4725541a4b Fix missing names in GUI machines (#1147) 2017-06-22 23:30:23 +01:00
modmuss50
138de281f4
Fixes issue with cable crafting, #betaBuild 2017-06-22 20:27:05 +01:00
Nourepide
81f9d46b88 Language: Fixing missing names and removing unused code 2017-06-22 20:47:42 +04:00
Nourepide
56ab571f6d Settings language fix 2017-06-22 19:05:08 +04:00
bogger33
2c9b808670
add dustAsh oreDict recipe (#1128)
(cherry picked from commit 61ad7ee)
2017-06-22 13:05:08 +01:00
modmuss50
7bbb23c876
Fix drill being able to break bedrock, and slow it down slightly 2017-06-22 12:58:43 +01:00
modmuss50
8cf46ef273
Fix extracting from the auto crafting table. 2017-06-22 12:51:28 +01:00
modmuss50
b083d6b5fc
Fix custom recipe support 2017-06-22 12:46:02 +01:00
modmuss50
412d66593b
Large amount of work toward being able to place the recipe into the gui. 2017-06-22 00:29:57 +01:00
modmuss50
bee8d4aab0
Some minor fixes to the auto crafting table 2017-06-21 23:39:40 +01:00
modmuss50
ba99f70406
Auto fill grid in the correct patten 2017-06-21 23:31:40 +01:00
modmuss50
04721e447d
Start work on intelligent item insertion. 2017-06-21 20:26:56 +01:00
modmuss50
43d741d4b6
Fix language names 2017-06-21 17:39:52 +01:00
modmuss50
24efcf057f
Fix lesu missing texture. 2017-06-21 17:36:36 +01:00
modmuss50
10c48aaadd
Partially revert LESU name change. 2017-06-21 17:32:19 +01:00
modmuss50
3a0c5a6f31
Fix crash with auto crafter 2017-06-21 17:13:07 +01:00
modmuss50
9477797ec7
Save recipe to nbt 2017-06-21 17:05:48 +01:00
modmuss50
944d2b7b5c
Fix some small issues 2017-06-21 16:35:15 +01:00
modmuss50
6982342dc0
Basic auto crafting logic 2017-06-21 16:22:57 +01:00
modmuss50
6bba67640c
Textures for auto crafting table 2017-06-21 15:51:31 +01:00
modmuss50
a3c4b9f3ed
Show the recipe in the autocrafting gui 2017-06-21 15:25:18 +01:00
modmuss50
0e9c61bd60
Fix slot alignment in autocrafting Gui 2017-06-21 10:00:53 +01:00
modmuss50
e962f44fb3
Work on the auto crafting gui 2017-06-21 09:47:36 +01:00
modmuss50
82aa0e730f
Update forge and mappings to latest 2017-06-21 09:07:36 +01:00
modmuss50
543f3fbdc9
Fix leaf rendering 2017-06-20 22:13:47 +01:00
modmuss50
53ac9e44c1
Fix generator localised name 2017-06-20 22:06:17 +01:00
modmuss50
1bc724ebfc
Disable dev features by default 2017-06-20 22:04:39 +01:00
modmuss50
59a92a43c6
Remove "expensive" recipe configs, and they had no point to be there. 2017-06-20 22:01:00 +01:00
modmuss50
dd2e21d8bc
Fixes solar panel and grinder recipes. (will need to delete recipes config) 2017-06-20 21:59:26 +01:00
modmuss50
86d4daaea7
inv stuff 2017-06-20 21:38:51 +01:00
modmuss50
a7316bc6c0
More auto crafting table stuff 2017-06-20 21:31:21 +01:00
modmuss50
3071d19db0
Initial work on Auto crafting table. 2017-06-20 18:54:45 +01:00
modmuss50
7eaef93136
Fix server start-up crash, #betaBuild 2017-06-18 14:14:42 +01:00
Prospector
f05221d1ef Fix a couple unlocalized names 2017-06-16 08:30:13 -07:00
Prospector
b80235504f Fix the rest of the models & remove manual and heat generator 2017-06-16 08:20:30 -07:00
Prospector
977e0657ff Fix rubber tree stuff models 2017-06-16 07:32:11 -07:00
IvanSteklow
fb0b4b54cf Create ru_ru.lang (#1137) 2017-06-15 14:41:41 +01:00
modmuss50
a701094d1d
Update all license headers 2017-06-15 12:28:26 +01:00
modmuss50
24faea17ba
Fixes issue in recipes + update forge 2017-06-15 12:07:03 +01:00
modmuss50
ae0fa1abd7
Fix a large bunch of lang entry's 2017-06-15 11:42:53 +01:00
modmuss50
aa615f86bd
Recipes are now added to the recipe book when a tree tap is used. 2017-06-15 11:35:08 +01:00
modmuss50
5536a6cd94
Recipes can now show in the recipe book 2017-06-15 11:01:33 +01:00
Prospector
bdcb8bf327 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12 2017-06-15 00:01:51 -07:00
Prospector
cc27a1ed14 More WIP 2017-06-15 00:01:37 -07:00
modmuss50
5570a52539
Sawmill recipes work again 2017-06-14 23:50:49 +01:00
modmuss50
426001251f
Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2017-06-14 23:30:35 +01:00
modmuss50
f1c5a0ad8d
Large bunch of recipe work, still shapedOreRecipes need fixing. 2017-06-14 22:50:20 +01:00
Prospector
40e3062903 Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP) 2017-06-14 08:56:09 -07:00
Prospector
1fa9f1cf52 Begin the Great Refactor of Mid-2017 2017-06-13 16:49:52 -07:00
modmuss50
a4a4042eb1
Fix #775, The oldest open bug, and it only took me 5 mins 2017-06-13 22:37:03 +01:00
modmuss50
708ccc758a
Mappings update 2017-06-13 22:07:49 +01:00
modmuss50
3400f42962
Lighten the oil texture, might revert it im not sure? 2017-06-13 21:27:06 +01:00
modmuss50
9619ada825
Added underground oil lakes 2017-06-13 21:16:17 +01:00
modmuss50
2292741443
Update walia support 2017-06-13 20:37:17 +01:00
modmuss50
cb0303d82f
Remove old int tiers 2017-06-13 20:28:50 +01:00
modmuss50
b1721890b5
Transformer improvements 2017-06-13 20:26:23 +01:00
modmuss50
1de4c4ff2b
Remove upgrade slots from Energy Storage blocks 2017-06-13 19:46:47 +01:00
modmuss50
c51b74fd68
Small fixes to the IDSU 2017-06-13 19:43:27 +01:00
modmuss50
5dd9fb14a1
Fixes item tool tips not rendering in gui's 2017-06-13 17:36:33 +01:00
modmuss50
70a2755796
Fix IDSU saving 2017-06-13 17:22:29 +01:00
modmuss50
44817f1a03
Use WorldStorage, but it still doesn't save :/ 2017-06-13 16:11:41 +01:00
modmuss50
f90bb45351
Move idsu manger to use capability's 2017-06-13 16:02:49 +01:00
modmuss50
14e30481e5
Improve IDSU 2017-06-13 13:14:02 +01:00
modmuss50
c4868a3264
Changes to the LightningRod 2017-06-13 13:03:32 +01:00
modmuss50
3829e83459
Fixes #1131 2017-06-13 12:48:31 +01:00
modmuss50
df62000513
Found some more null itemstacks 2017-06-13 11:26:08 +01:00
modmuss50
c3c0a0421d
Lower generator output 2017-06-12 21:02:22 +01:00
modmuss50
2df2a1d1ba
Remove old config system 2017-06-12 20:51:36 +01:00
modmuss50
fed253332b
Move ore config, and use normal gson 2017-06-12 20:44:10 +01:00
modmuss50
50bb4ea7a9
More configs! 2017-06-12 20:38:43 +01:00
modmuss50
b7e141e004
More config changes 2017-06-12 20:33:30 +01:00
modmuss50
0cf3e43992
Update to support RC changes 2017-06-12 20:06:15 +01:00
Prospector
f3726fd174 Update cable item textures 2017-06-12 10:40:35 -07:00
Prospector
11527b3a22 Fix cable models 2017-06-12 10:25:29 -07:00
modmuss50
e0c39a4777
Fix Creative tab issue 2017-06-12 17:30:21 +01:00
modmuss50
7426d83900
Remove broken VeinGenerator 2017-06-12 14:40:30 +01:00
modmuss50
cf5ed6afa0
Remove stupid/unused configs 2017-06-12 14:39:06 +01:00
modmuss50
b25742dde0
Auto format code 2017-06-12 14:23:32 +01:00
modmuss50
fc4d8686b8
Support RC changes 2017-06-12 14:19:16 +01:00
modmuss50
e0f63fd0c5
Try and fix cable inv rendering 2017-06-12 11:17:57 +01:00
modmuss50
624d8fb93a
Remove old cables 2017-06-12 10:55:26 +01:00
modmuss50
007e8714fa
Improvements to cables. 2017-06-12 10:47:38 +01:00
modmuss50
7a8a152911
Fix GUI's having a floating button 2017-06-12 10:28:57 +01:00
modmuss50
41c94b2a52
Fix CreativeSolar panel smoking when pushing power. 2017-06-12 09:52:43 +01:00
modmuss50
06d366b941
Update Gradle + JEI compact 2017-06-12 09:48:52 +01:00
modmuss50
29cf9fa90b
1.12 2017-06-11 21:22:07 +01:00
Prospector
b6cf2a2c59 Remove a few old configs 2017-06-09 10:35:54 -07:00
Prospector
81f701477c Fix compile 2017-06-09 08:47:44 -07:00
Prospector
2d5d60be6b Do more configs. Still a lot to go 2017-06-09 08:31:19 -07:00
modmuss50
cba5fff3c2
Remove new cable from JEI blacklist 2017-06-09 15:11:59 +01:00
modmuss50
c7419ee8ac
Update to support new RC teir calculations 2017-06-09 14:53:24 +01:00
Prospector
2b7868c651 More configs & start fixing cable models 2017-06-08 19:12:58 -07:00
Prospector
ad36dfcddb Started redoing config 2017-06-08 11:45:30 -07:00
modmuss50
2eac072a92
Update to fix compile issues with new JEI api 2017-06-08 11:13:01 +01:00
modmuss50
0aafea9758
Should fix issues with recipes not being removed from JEI when using CT, closes #1121 and closes #1118 2017-06-06 12:56:50 +01:00
modmuss50
968cb057e1
Fix matter fab not using all output slots, closes #1101 2017-06-02 20:36:02 +01:00
modmuss50
dd7005dc0a
Disable upgrade slots in electric furnace for now, closes #1064 2017-06-02 20:32:55 +01:00
modmuss50
f9d4134365
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:32:03 +01:00
ProfessorProspector
82927ae405
Start redoing Matter Fabricator gui
(cherry picked from commit 5c6bc6c)
2017-06-02 20:23:07 +01:00
modmuss50
2dffd85ccc
Fix compile errors with merge 2017-06-02 20:20:56 +01:00
modmuss50
e7813a4bed
Fix matterfab only using its first slot, closes #1076
(cherry picked from commit 694d1d4)
2017-06-02 20:14:18 +01:00
modmuss50
be4df1d6c9
Fixes Industrial Electrolyzer not using the ore dict closes #1022
(cherry picked from commit f88c25a)
2017-06-02 20:13:34 +01:00
modmuss50
d863417e7b
Hide invalid recipes when de-dupe mode is on, closes #1078
(cherry picked from commit 7e593bc)
2017-06-02 20:13:23 +01:00
modmuss50
0a7e6ac92f
Fixes rubber sapling model Closes #943
(cherry picked from commit 0e94364)
2017-06-02 20:13:12 +01:00
modmuss50
ae5b07d6bb
Fixes a handfull of recipe issues in FTB Beyond, closes #1021
(cherry picked from commit eef08aa)
2017-06-02 20:13:03 +01:00
modmuss50
4e47e2102e
Fix LESU, closes #999 closes #938 closes #761 2017-06-02 20:10:00 +01:00
modmuss50
2c16bf58b7
Update license header 2017-06-02 19:35:51 +01:00
modmuss50
6eae3e637e
Hide cable in JEI + update JEI compat 2017-06-02 16:24:40 +01:00
modmuss50
aa50cfa7b9
Fix minetweaker changes not showing in JEI, closes #1068 2017-06-02 16:22:07 +01:00
modmuss50
b4c873f54c
Fixes IDSU not setting the players udid when placed. 2017-06-02 16:16:34 +01:00
modmuss50
029a75522c
Add basic crafttweaker support for scrapbox 2017-06-02 16:00:07 +01:00
modmuss50
2e1de815a9
Remove achievements as they are going away in 1.12 and were broken. 2017-06-02 15:49:12 +01:00
modmuss50
a6d0e57d10
Add expensive quarry recipe back in. 2017-06-02 15:44:00 +01:00
modmuss50
3a6724b6f4
Advanced diamond drill is now 3x3 2017-05-27 01:49:07 +01:00
modmuss50
672b3ac6f1
Add basic cable textures, needs some work 2017-05-27 01:02:50 +01:00
modmuss50
b8a2d2d266
Commit uncommitted power net code 2017-05-25 20:35:36 +01:00
modmuss50
d474870977
Initial work on standalone cables. 2017-05-19 13:12:02 +01:00
modmuss50
98a3377c0c
Fix issues where the incorrect amount of power was being transfered. 2017-05-18 19:17:28 +01:00
modmuss50
8966538f1b
Some more power changes. 2017-05-18 17:19:29 +01:00
modmuss50
034ca86c79
Fix cables not receiving power correctly 2017-05-18 17:00:09 +01:00
modmuss50
aee7ca9f14
Rewrite cable logic to use FE.
Fixes #1077 Fixes #1071 Fixes #1067 Fixes #1070 Fixes #1059 Fixes #1044 Fixes #1041 Fixes #1025 Fixes #1006 Fixes #990 Fixes #987 Fixes #962 Fixes #955 Fixes #897
2017-05-18 16:01:18 +01:00
drcrazy
74f798e9c3 Rolling machine fixes (#1075)
* Fix for issue #942
2017-05-02 18:38:16 +01:00
modmuss50
3d55b435d4
Ic2 1.11.2 support 2017-04-21 09:09:28 +01:00
ProfessorProspector
ee9e46eaa3 Clean up mcmod.info and add space to mod name 2017-04-19 19:37:07 -07:00
Dimmerworld
0bef19767d Add tooltips for some unfinished blocks
* Add tooltips for some unfinished blocks
2017-04-15 18:23:21 +01:00
Dimmerworld
4d4a6e6fac Add Glowstone grinder recipe (#1060)
* Added Glowstone dust grinder recipe
2017-04-15 08:25:20 +01:00
modmuss50
d605b7175f
Fix Server crash with last version, #releaseBuild 2017-04-14 22:33:21 +01:00
Dimmerworld
723fc1a551 Fix matter fabricator uses scrapboxs when full (#1052)
* Fix matter fabricator using scrapboxes when full
2017-04-14 09:56:11 -07:00
Dimmerworld
ff3baf46f3 Fluid textures for cells (#1051)
* Added temporary textures for all the liquids(cells)
2017-04-14 06:43:18 -07:00
Dimmerworld
16462d0dad Spelling fixes in config and localized AverageEuOutTickTime (#975) (#1050)
Fixed a number of spelling errors and added barebones information for
#975

* Fixed spelling mistake
2017-04-14 04:17:15 -07:00
Dimmerworld
b84bc89fdb Fixed Nuke lang and added Tooltips header (#1048) 2017-04-14 02:49:26 -07:00
ProfessorProspector
fb888cb769 Texture changes 2017-04-13 20:54:01 -07:00
modmuss50
ef878d978d
Add warning when mod fingerprints are invalid. 2017-04-13 11:56:27 +01:00
modmuss50
995f28642a
Remove unused classes 2017-04-13 11:52:51 +01:00
modmuss50
83e904f464
Fix build 2017-04-13 11:26:16 +01:00
modmuss50
02f17871c6
Added power teir upgrades. 2017-04-12 19:58:03 +01:00
modmuss50
7ba7b2172d
Textures and lang files for the new upgrades. 2017-04-12 18:42:53 +01:00
modmuss50
1c1f540a26
Drop upgrades when machine is broken, shift right-click to add into machine. 2017-04-12 18:31:26 +01:00
modmuss50
d9af8309b1
Finished the gui, and start work on adding support for the furnace. 2017-04-12 18:04:10 +01:00
modmuss50
7541ba4dbb
Add the basic gui for side configuration 2017-04-12 16:35:56 +01:00
modmuss50
088f49c305
Allow the upgrades to be right clicked when in the gui. 2017-04-12 16:21:04 +01:00
modmuss50
5487584f04
Finish off the rendering for the upgrades. 2017-04-11 21:10:48 +01:00
modmuss50
e05c132c3a
Added basic push and pull upgrades 2017-04-11 20:42:55 +01:00
modmuss50
6355d11b0f
Add energy storage upgrades. 2017-04-11 19:26:46 +01:00
modmuss50
1ccd192790
Update to work with major RC changes. 2017-04-11 19:12:32 +01:00
modmuss50
539c5d0091
Some more work on the upgrades. 2017-04-11 14:59:59 +01:00
modmuss50
4f05367f52
Got the upgrades working, just need the textures. 2017-04-11 13:21:23 +01:00
modmuss50
c678fe7f9a Add example speed upgrades. 2017-04-11 00:30:27 +01:00
modmuss50
0e41a97f7e Looks like I missed a place where it was being used. 2017-04-11 00:17:52 +01:00
modmuss50
34978f7ffe Remove old upgrade handler to make way for the new one. 2017-04-11 00:12:36 +01:00
ProfessorProspector
01d1650ebf A few texture fixes and hide source blocks 2017-04-08 09:26:27 -07:00
modmuss50
8530cb7d7b
Load saw mill recipes later to make sure other mods have added their recipes before ours. 2017-04-08 15:58:21 +01:00
modmuss50
f2cbd23994
Find sawmill recipes from all other recipes. 2017-04-08 15:56:24 +01:00
modmuss50
21dd44def6
Increase iron furnace speed 2017-04-08 15:08:58 +01:00
modmuss50
bcfb330632
Fixes #1036 2017-04-08 15:03:46 +01:00
modmuss50
833efcd574
Fixes #1023 2017-04-08 14:52:28 +01:00
drcrazy
b136a534aa Industrial Sawmill support for JEI done 2017-04-08 01:52:29 +03:00
drcrazy
291eadfeed More work for Sawmill 2017-04-07 18:22:37 +03:00
drcrazy
8b4ce46e46 Initial commit for Insdustrial Sawmill JEI support 2017-04-07 02:53:09 +03:00
ProfessorProspector
94341db24a Fix axes I broke 2017-03-30 18:56:15 -07:00
ProfessorProspector
dc638cea9c Axes extend ItemAxe Fixes #1027 2017-03-30 18:02:58 -07:00
modmuss50
10bbdbc4d7
Fixes thermal generator crash, closes #972
(cherry picked from commit bb582fd)
2017-03-16 15:54:48 +00:00
modmuss50
056eff09b2
Some more improvements to the power net. 2017-03-16 13:22:17 +00:00
modmuss50
332fe1be48
Fixes crash when gem tools are disabled, closes #1008 2017-03-15 10:08:58 +00:00
modmuss50
5231e1d93b
Fix Industrial Grinder getting stuck at 100%, closes #1004 2017-03-15 09:59:23 +00:00
modmuss50
5ed6760db9
Machines no longer explode when they receive too much power, they just smoke. Fix a crash with the power net.
(cherry picked from commit 2ae5951)
2017-03-15 09:48:33 +00:00
modmuss50
50093455ab
Experimental changes to try and fix some issues with the power net.
(cherry picked from commit ad940a7)
2017-03-15 09:48:29 +00:00
modmuss50
92acc51aaf
Added a creative panel, it provides infinite power and has no recipe.
(cherry picked from commit 456ee3c)
2017-03-15 09:48:25 +00:00
modmuss50
da6925195b
Update CraftTweaker support 2017-03-14 12:59:17 +00:00
modmuss50
a960f1820a
Fix incorrect height when generating ores. Closes #1007
(cherry picked from commit d50f91d)
2017-03-14 12:42:03 +00:00
modmuss50
8b80cb7562
De-Dupe Frequency Transmitter
(cherry picked from commit 127df1f)
2017-03-13 11:04:25 +00:00
modmuss50
35e104d901
Fixes issue with small dust recipes, closes #1005
(cherry picked from commit 80a387b)
2017-03-13 11:04:17 +00:00
modmuss50
fe9d1defdc
Fix null issue with last cherry pick 2017-03-13 11:04:10 +00:00
modmuss50
bbf93c3ae3
Rewrite some of the logic behind the matter fabricator, now works with ic2 scrap as well.
Closes #1002 and Closes #822

(cherry picked from commit 93ccd8b)
2017-03-13 11:03:44 +00:00
modmuss50
76332ee946
Fixes some recipes not using the ore dict correctly.
(cherry picked from commit 3ee81c2)
2017-03-13 11:02:56 +00:00
modmuss50
1656b4b4a0
Remove WIP tag from charge bench as it works
(cherry picked from commit 3025d5c)
2017-03-13 11:01:53 +00:00
modmuss50
82c9d00f97
Added recipe for endstone dust, closes #989
(cherry picked from commit 96d8220)
2017-03-13 11:01:41 +00:00
modmuss50
d126edaa1b
Fixes #981 2017-02-23 12:38:36 +00:00
modmuss50
26c208e811
Added license info to the header of all files. 2017-02-23 12:29:43 +00:00
mezz
5c13230c42 Stop worldgen chunk generation runaway from rubber trees 2017-02-16 18:22:42 -08:00
mezz
6e98c7e0bc Stop minor worldgen chunk generation runaway from iridium 2017-02-15 20:52:41 -08:00
modmuss50
2a543b4170
Fixes crash with player detectors, closes #973
(cherry picked from commit 58ff71b)
2017-02-13 10:30:44 +00:00
al132
d1fe85c4f3 Fix Nether Ore Gen above nether ceiling
Same as 1.10.2 PR
2017-02-04 21:28:36 -06:00
Ourten
57d1c60750 Fix JackHammer crash when mining blocks 2017-02-04 13:47:26 +01:00
Ourten
9847719a91 Fix automation for IndustrialGrinder and IndustrialElectrolyzer, closes #953 2017-02-03 16:57:34 +01:00
Ourten
e0300d3a05 Fix nanosaber log spam 2017-02-03 14:18:15 +01:00
Ourten
08087871a1 Fix wrench drop of LightningRod, SolarPanel, WaterMill and WindMill 2017-02-02 22:28:48 +01:00
Ourten
eafc5c831d Fix Grinder not displaying energy info 2017-02-02 22:23:00 +01:00
Jim Groth
3bee9245f8 Added grinder recipe for endstone. 2017-02-02 03:51:58 +01:00
modmuss50
5978b31dfc
Fix for iridium not spawning in stone. 2017-02-01 17:35:29 +00:00
modmuss50
4ac134ef26
New textures for iridium to make it standout a bit more. Thanks @VanDerGroot 2017-02-01 17:27:41 +00:00
modmuss50
2b546b1991
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff 2017-02-01 17:10:29 +00:00
modmuss50
927b99df02
Add Iridium plate recipe to ic2 compressor.
(cherry picked from commit 2f5817c)
2017-01-31 13:33:35 +00:00
modmuss50
f392cd4290
Fix issues with getting item stacks, Closes #940 and fixes a bunch of other stuff 2017-01-31 12:33:00 +00:00
modmuss50
45600ded32
Merge remote-tracking branch 'origin/1.11.2' into 1.11.2 2017-01-31 12:29:34 +00:00
modmuss50
12f23f6434
Add a recipe for clay dust into the grinder, closes #945 2017-01-31 12:29:18 +00:00
Ourten
1b084569ac Fix recycler outputSlot 2017-01-27 01:46:16 +01:00
modmuss50
77280fad79
Fix nukes. 2017-01-26 21:44:18 +00:00
modmuss50
c058e2fbee
Fix #932 2017-01-24 21:28:54 +00:00
modmuss50
38cad3b0f1
Should remove the last few issues with the power net, closes #924 and #930 2017-01-24 21:21:02 +00:00
modmuss50
f2a3e61603
Merge branch '1.11.2' of https://github.com/TechReborn/TechReborn into 1.11.2 2017-01-24 21:11:37 +00:00
modmuss50
ed771a6e05
Fix rolling machine power storage value being large, closes #934 2017-01-24 21:11:27 +00:00
Ourten
ae31e8a0dc Fix steel jackhammer config values, closes #927 2017-01-23 13:39:00 +01:00
Ourten
fea2ce5f1f Improve FluidGenerators performance with recipes check 2017-01-19 01:12:32 +01:00
modmuss50
fb83e98707
fixes #914 2017-01-18 15:18:43 +00:00
modmuss50
4e0878b182
Move this to the correct location 2017-01-18 11:23:52 +00:00
modmuss50
0872a802da
Update to support new item power. 2017-01-18 09:55:24 +00:00
modmuss50
2c53c16010
Fixes #877 2017-01-17 22:12:30 +00:00
modmuss50
e93c580528
Fix Minetweaker issue. 2017-01-16 10:06:11 +00:00
modmuss50
a172c6aabe
Add coal to the grinder. 2017-01-16 10:03:58 +00:00
modmuss50
9e02f1ff35
Add config to disable railcraft steel recipe. 2017-01-16 10:01:00 +00:00
Ourten
64020b01e0 Fix AlloyFurnace ItemStack null reference, closes #901 2017-01-15 23:45:48 +01:00
ProfessorProspector
38525a5bb0 Multiblock work, and industrial grinder gui 2017-01-14 11:06:34 -08:00
modmuss50
84c03dbe3f
Fix MT issue, closes #888 2017-01-14 16:56:41 +00:00
modmuss50
2a632ac265
Fix some recipe issues, closes #899 2017-01-14 16:53:49 +00:00
modmuss50
2c60034a88
Update to new RebornCore. Added a config setting to disable railcrafts Iron Nugget to Steel Nugget recipe. 2017-01-11 15:33:34 +00:00
modmuss50
5588bda10b
Update to support updated recipe format in reborn core.
(cherry picked from commit 6aa8fde64a)

# Conflicts:
#	src/main/java/techreborn/api/recipe/BaseRecipe.java
#	src/main/java/techreborn/api/recipe/recipeConfig/RecipeConfigManager.java
#	src/main/java/techreborn/compat/jei/BaseRecipeWrapper.java
#	src/main/java/techreborn/compat/minetweaker/MTGeneric.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-11 08:34:29 +00:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
modmuss50
0d22eb2c56
Fix jackhammer not breaking all rocks, closes #864 2017-01-10 19:28:12 +00:00
ProfessorProspector
af91263621 Chemical reactor GUI & a couple recipe fixes 2017-01-09 16:54:48 -08:00
ProfessorProspector
99be70713b Recycler gui 2017-01-09 15:57:29 -08:00
ProfessorProspector
06cb13b910 useless range upgrade 2017-01-09 07:18:19 -08:00
modmuss50
b8949ee8fa
Add power net to profiling data. 2017-01-09 12:55:08 +00:00
ProfessorProspector
dc160bbd67 started with one thing...then I ended up doing a lot of shit. 2017-01-08 23:03:36 -08:00
Ourten
4e6b60e8e7 Fix tier1 machines hopper integration 2017-01-09 00:49:57 +01:00
Ourten
ac322f3e65 Fix recycler, Closes #887 2017-01-09 00:27:53 +01:00
Ourten
25e683b2e9 Fix some tiles update on clientside 2017-01-08 23:49:56 +01:00
ProfessorProspector
0c4895efa4 Electric Furnace gui! 2017-01-08 14:46:13 -08:00