Commit graph

3485 commits

Author SHA1 Message Date
drcrazy
77fa583360 More models for energy storages 2019-04-26 17:59:37 +03:00
drcrazy
5c309c8b3d Updated forge to 1.13.2 - 25.0.191. Removed unused imports 2019-04-26 17:37:10 +03:00
drcrazy
8cc611192d Lapotron Crystal dedupe for #1665 2019-04-25 16:40:36 +03:00
drcrazy
d30d3316e9 Energy Crystal dedupe for #1665 2019-04-25 16:07:06 +03:00
drcrazy
2afa32ad9e Models for some energy storages 2019-04-24 17:36:09 +03:00
drcrazy
86a2056903 Models for transformers. Optimus Prime FTW! 2019-04-24 17:19:15 +03:00
drcrazy
138c5e6072 De-dupe for re-battery. Some work on #1665 2019-04-23 20:57:56 +03:00
drcrazy
a506f4b301 Updated rubber log usage. Some work on #1706 2019-04-23 16:14:54 +03:00
drcrazy
a9acc91eff Models for generators done 2019-04-22 18:58:02 +03:00
drcrazy
a1fc56042a Models for generators 2019-04-22 17:38:17 +03:00
modmuss50
9f39da44b1 things craft 2019-04-15 21:54:55 +01:00
modmuss50
d45284de2c Add a wrapper around Ingredient to allow for stack sizes 2019-04-15 20:46:25 +01:00
modmuss50
1dad4697ba Start moving everything over to the new system 2019-04-14 17:01:38 +01:00
modmuss50
98dd01697c Basic test of a grinder recipe 2019-04-14 16:17:26 +01:00
drcrazy
c57c8b5287 Filter compressor and extractor recipes from JEI if IC2 dedupe is true 2019-04-12 12:45:34 +03:00
drcrazy
dde849e19a More debug info 2019-04-09 18:04:03 +03:00
drcrazy
f906aaa3cd Fix sap side 2019-04-09 17:04:51 +03:00
drcrazy
2a180cb5c2 Commented out tank update() 2019-04-09 16:34:54 +03:00
drcrazy
cd48daa152 Tier3 machine models done. 2019-04-09 15:04:05 +03:00
drcrazy
04f4e51695 Models for tier2 machines done. 2019-04-09 12:45:29 +03:00
drcrazy
76c2c03a13 More models for tier2 machines 2019-04-08 16:59:06 +03:00
drcrazy
3892b15685 More models for tier2 machines 2019-04-05 16:19:39 +03:00
drcrazy
6fecbb9392 Solar panels got models 2019-04-05 13:19:01 +03:00
drcrazy
4df9d62a90 More models 2019-04-04 17:29:03 +03:00
modmuss50
75f06f6f80 Make creative solar panel quicker 2019-04-03 22:31:16 +01:00
modmuss50
afe6a179af Optimise matter fab a bit 2019-04-03 22:09:44 +01:00
modmuss50
925a7b4c0a Add tank support for Fluid Replicator, fixes https://github.com/TechReborn/TechReborn/issues/1698 2019-04-03 21:48:44 +01:00
drcrazy
ec2fcf5d6d Removed unused import. 2019-04-03 18:24:27 +03:00
drcrazy
b713b43eaf Transformers\Energy storages will use vanilla rotation. Closes #1692 2019-04-03 18:23:28 +03:00
drcrazy
c122a480e5 Updated forge and mappings 2019-04-01 17:22:59 +03:00
drcrazy
67c9c8721e Changes in GUI for Freezer multiblock. Closes #1672 2019-04-01 15:57:08 +03:00
drcrazy
74d1837167 Updated freezer multiblock. More work on #1672 2019-04-01 15:27:58 +03:00
drcrazy
080e305efe Models for iron machines 2019-03-29 17:03:10 +03:00
drcrazy
c45e7fb836 Tier1 machines got models 2019-03-29 14:41:08 +03:00
drcrazy
5a910c94af Model for alloy smelter 2019-03-28 18:09:48 +03:00
drcrazy
16ff7af929 Updated vacuum freezer multiblock. Some work for #1672 2019-03-28 18:09:25 +03:00
drcrazy
84a380f51e Frames&Casings 2019-03-27 14:49:09 +03:00
drcrazy
0feec0612c Done with models for items. Except cell ( 2019-03-27 03:49:30 +03:00
drcrazy
f9c484090f Model for lithium batpack 2019-03-26 22:22:24 +03:00
drcrazy
79af5c0a15 Models for batteries 2019-03-26 21:07:34 +03:00
drcrazy
d3c6d43fee Tags for rubber stuff 2019-03-26 18:10:18 +03:00
drcrazy
5353b9c773 Upgrades got models 2019-03-26 15:29:38 +03:00
drcrazy
01103a26ba Check blast furnace upgrades both on client and server. Closes #1694 2019-03-26 14:28:59 +03:00
modmuss50
8ab9724181 Fixes #1695 2019-03-25 21:41:50 +00:00
modmuss50
17427e675e Fixes https://github.com/TechReborn/TechReborn/issues/1693 and Fixes https://github.com/FTBTeam/FTB-Sky-Odyssey/issues/102 2019-03-25 21:37:27 +00:00
drcrazy
8261874665 Should fix #1691 2019-03-25 14:36:48 +03:00
drcrazy
38e52f4a0f Migrated to vanilla approach 2019-03-25 12:45:20 +03:00
drcrazy
a3b41b9f3f More gem armour and tools 2019-03-25 12:43:50 +03:00
modmuss50
053324154e Improve creative solar panel 2019-03-24 00:54:54 +00:00
modmuss50
fc277000b8 Fix super conductor output on aesu's 2019-03-23 20:01:30 +00:00
modmuss50
1d78c60e51 Superconductor update, adds cables, and new upgrades. 2019-03-23 18:03:41 +00:00
modmuss50
0ca18ade97 Fix a bug with the auto crafting table 2019-03-17 21:50:26 +00:00
drcrazy
dd6a06409e Bronze armor and tools 2019-03-17 23:47:21 +03:00
drcrazy
f4ef5cc2d4 More models for items 2019-03-17 21:48:24 +03:00
drcrazy
1c86c6c031 Tree grow from sapling. Not correctly though ( 2019-03-17 21:39:07 +03:00
modmuss50
425f8921fc Improve auto crafting table performance with large amount of recipes. 2019-03-17 17:08:39 +00:00
modmuss50
d7f0e04034 Hold shift to go faster in the AESU gui, closes #1686 2019-03-17 16:10:20 +00:00
modmuss50
ee0d72223a Merge remote-tracking branch 'origin/1.12' into 1.12 2019-03-17 15:08:03 +00:00
modmuss50
79586e0a62 Fix #1688 2019-03-17 15:07:14 +00:00
ralphII
9ebec4429f Fix RollingMachine tile not updating its active state (#1687) 2019-03-17 14:56:47 +00:00
drcrazy
704ad8df07 Rubber tree can grow now. 2019-03-15 16:36:34 +03:00
drcrazy
bfd6f16504 Rubber log works. Need to doublecheck sap side 2019-03-15 15:14:19 +03:00
drcrazy
3cde5c8244 Facelift for debug tool 2019-03-15 14:14:21 +03:00
drcrazy
5c6b268dcb Some polishing for Rubber Tree feature 2019-03-14 12:58:23 +03:00
drcrazy
889e576683 Started porting for Rubber Tree world gen feature 2019-03-13 18:13:49 +03:00
drcrazy
d2db53f6f2 More rubber stuff 2019-03-13 14:57:49 +03:00
drcrazy
9079765bc9 Easy part of textures for materials done 2019-03-13 13:53:31 +03:00
drcrazy
8b9f877d20 More materials got textures 2019-03-13 12:58:22 +03:00
drcrazy
92530b08b1 Ingots got textures 2019-03-12 14:41:17 +03:00
drcrazy
c58bf04667 Cleanup of migrated blocks\items 2019-03-11 17:15:02 +03:00
drcrazy
0db5a756b5 Parts got textures 2019-03-11 17:08:15 +03:00
drcrazy
3667f56bd8 Couple of items got their textures back including itemGroup 2019-03-11 13:42:51 +03:00
drcrazy
96bbe75c60 Removed unused imports 2019-03-11 02:22:49 +03:00
modmuss50
ac173a5a75 Add scrap box to matter fab, fixes https://github.com/TechReborn/TechReborn/issues/1682 2019-03-08 13:34:55 +00:00
drcrazy
682b8ccede Do not create already existing block property 2019-03-07 11:49:23 +03:00
modmuss50
46b1e920e9 Add shear mode to chainsaw, closes #1668 2019-03-06 15:32:55 +00:00
modmuss50
73465f4b38 Add toggle for drill AOE effect, shift click to enable/disable. Fixes #1670 2019-03-06 15:18:44 +00:00
modmuss50
99d4350428 Much better wood searching, should now handle large and complex trees well, closes #1680 2019-03-06 15:11:19 +00:00
modmuss50
76c81c9e90 Fix #1679 2019-03-06 14:53:50 +00:00
modmuss50
8270f57e6f Fix #1674 2019-03-06 14:48:53 +00:00
modmuss50
b560a5483d Dont allow recycling of upgrades 2019-03-06 14:41:06 +00:00
modmuss50
b62b8cc248 Fix #1678 2019-03-06 14:34:16 +00:00
drcrazy
4650f3e375 Moved remainings of postInit to loadComplete 2019-03-06 17:34:10 +03:00
modmuss50
8b2c098b27 Add some bad code to stop the creative solar panel from exploding when FE is disabled. 2019-03-06 14:29:22 +00:00
modmuss50
e7715937cf Increase the AESU max power to 16192 2019-03-06 14:28:50 +00:00
modmuss50
3ca9347212 Update Auto crafting table to use the better code from the rolling machine, should fix some issues. 2019-03-06 14:06:02 +00:00
drcrazy
d29eb5706d Storage blocks got their textures 2019-03-05 17:27:28 +03:00
drcrazy
a4d9401040 At least block models could be in subfolders 2019-03-04 18:14:41 +03:00
drcrazy
d6d0515a1b Blockstate+models for ores 2019-03-04 17:37:01 +03:00
drcrazy
f64229efb4 Fix tags 2019-03-04 12:34:23 +03:00
modmuss50
38eca7b3e8 Fix lang 2019-03-02 18:57:58 +00:00
modmuss50
ff1370a3fd Fix opening guis, still needs some work, but atleast it works now 2019-03-02 18:45:33 +00:00
drcrazy
f94d6630fb More scrapbox recipes and less spam 2019-03-02 03:36:04 +03:00
drcrazy
97b517580a Fixed license 2019-03-01 18:59:11 +03:00
drcrazy
f6579f5c2c Rubber Plank stairs got textures 2019-03-01 17:29:19 +03:00
drcrazy
f6d94647e2 Rendering for grinder 2019-03-01 15:36:04 +03:00
drcrazy
3ce99b987f TE should register now 2019-03-01 14:28:32 +03:00
drcrazy
0666ade222 Fixed typo 2019-02-28 18:04:11 +03:00
drcrazy
59b0633353 Added ArmorMaterials 2019-02-27 17:58:00 +03:00
drcrazy
eb51e07998 ToolTier values migrated in a dirty way 2019-02-26 15:39:10 +03:00