Commit graph

2300 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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