Commit graph

1100 commits

Author SHA1 Message Date
Exidex
6c5e1018b9 Tool stuff 2017-08-16 22:36:20 +02:00
Muramasa-
813cd58c2d tools almost finished, start use RecipeMap in processors 2017-08-16 05:49:36 +01:00
Dragon2488
bc1d1fe068 Stones finished 2017-08-15 16:27:26 +07:00
Dragon2488
5f3e2d6ad5 Casings finished, VariantBlock fix 2017-08-15 15:52:02 +07:00
Dragon2488
de015cce20 VariantBlock, VariantItemBlock, more casings 2017-08-14 18:24:36 +07:00
Dragon2488
8372d4d38d Merge remote-tracking branch 'hub/1.10.2' 2017-08-14 16:38:53 +07:00
Dragon2488
adc118f64f partial casing blocks structuring 2017-08-14 16:38:43 +07:00
Muramasa-
601e6cc699 Tool class renaming 2017-08-14 05:37:01 +01:00
Muramasa-
7396bf7188 Forgot about these 2017-08-14 05:06:30 +01:00
Muramasa-
918558c0e4 More tool/proc work 2017-08-14 04:59:13 +01:00
Exidex
3b3421c856 MetaItem2 2017-08-13 19:51:21 +02:00
Exidex
9f33017a46 MetaItem1 2017-08-13 15:55:32 +02:00
Dragon2488
9909b49ece progress 2017-08-13 17:08:53 +07:00
Dragon2488
11d3898139 some progress 2017-08-13 16:28:24 +07:00
Exidex
856b72211f Fix recipe errors 2017-08-12 19:50:04 +02:00
Dragon2488
6ed42e0cb3 Merge remote-tracking branch 'hub/1.10.2'
# Conflicts:
#	src/main/java/gregtech/api/unification/stack/ItemData.java
#	src/main/java/gregtech/api/util/GT_BaseCrop.java
#	src/main/java/gregtech/common/GT_Proxy.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
#	src/main/java/gregtech/common/items/ItemComb.java
#	src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
#	src/main/java/gregtech/loaders/postload/GT_CropLoader.java
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
#	src/main/java/gregtech/loaders/postload/GT_ScrapboxDropLoader.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
2017-08-12 19:15:14 +07:00
Dragon2488
09239b641b Unification finish 2017-08-12 19:14:00 +07:00
Muramasa-
16b1a3a320 First MetaTool pass and general cleanup 2017-08-12 08:04:43 +01:00
Dragon2488
d7eb8738c1 Partial implementation of WorkableMetaTileEntity, many things about tile entities. 2017-08-12 14:02:53 +07:00
Dragon2488
2be8419ab0 capabilities finish 2017-08-12 11:48:57 +07:00
Dragon2488
9367f9b079 Some things for muramusa 2017-08-12 11:35:09 +07:00
Dragon2488
f4991d0924 stuff 2017-08-12 01:58:28 +07:00
Dragon2488
6261b32e87 Access Terraformer 2017-08-11 23:42:49 +07:00
Dragon2488
bd89829b88 Merge remote-tracking branch 'hub/1.10.2' 2017-08-10 19:24:38 +07:00
Dragon2488
e54032cfcb some packet and meta cool shit 2017-08-10 19:24:02 +07:00
Exidex
fdbba28f80 OrePrefixes finished 2017-08-08 22:38:57 +02:00
Exidex
5717fa5641 Adapt OrePrefixes to use new constructors. Not finished yet 2017-08-08 07:16:28 +02:00
Dragon2488
edf3b31a80 MetaTileEntity, IMetaTileEntityFactory, Containers 2017-08-08 12:03:25 +07:00
Dragon2488
eb48aa6b72 moves, OrePrefixes logic rewrite - now need to rewrite values declarations 2017-08-06 16:22:29 +07:00
Exidex
405479f158 Rewrite OrePrefixes#initMaterialComponents() 2017-08-05 21:19:34 +02:00
Exidex
c1e7927e50 Make blocks use new Material system. Also fix ore blocks state shift when material(s) got disabled or added 2017-08-04 19:46:00 +02:00
Exidex
bc4d2488d7 Move generation flags to constructors. Delete Materials#initSubTags() 2017-08-03 09:50:35 +02:00
Dragon2488
fa4a20cadd no more ton of whitespaces 2017-08-03 12:17:31 +07:00
Dragon2488
8837ef5f37 Material sub tags finish, TODO: move adding from addSubTags() into materials declarations 2017-08-03 11:50:20 +07:00
Exidex
12a780f5c1 All materials finished 2017-08-02 20:47:16 +02:00
Dragon2488
34d1c4585b some other materials, Material#toCamelCaseString() 2017-08-02 16:36:33 +07:00
Exidex
81a60a9e8b Finished Second Degree Compound materials 2017-07-30 21:36:34 +02:00
Exidex
d2718f76ed Finished First Degree Compound materials 2017-07-30 16:22:42 +02:00
Exidex
82f6ad8270 Some of the First Degree Compound materials 2017-07-29 23:16:19 +02:00
Exidex
c6f2ec728a Fix materials tool stuff and blastTemperature 2017-07-29 11:13:40 +02:00
Exidex
f0e5d6619d Help is here. Finished direct elements materials 2017-07-28 23:27:31 +02:00
Dragon2488
24d6a8da94 48 out of 79 direct element materials 2017-07-28 17:29:45 +07:00
Dragon2488
9e28b88727 help me 2 2017-07-28 10:00:51 +07:00
Dragon2488
038ed1b8cb help me please 2017-07-27 12:38:02 +07:00
Dragon2488
488504f5ee Merge remote-tracking branch 'hub/1.10.2' 2017-07-26 16:52:31 +07:00
Dragon2488
038f65a4c7 Развлекаемся с материалами дальше... 2017-07-26 16:52:15 +07:00
Exidex
8126e7b765 Cleanup GTRecipes, ModHandler and RecipeRegistrator. Also delete Special item 2017-07-23 18:20:39 +02:00
Dragon2488
002e4a3592 Merge remote-tracking branch 'hub/1.10.2' 2017-07-23 00:09:34 +07:00
Dragon2488
9261735d5c Fluid Material builders, Marker Material, some comments 2017-07-23 00:06:42 +07:00
Exidex
e609bd528a Make RecipeBuilder methods add items/fluids to array instead of overriding arrays. 2017-07-20 21:07:20 +02:00