Commit graph

832 commits

Author SHA1 Message Date
Dragon2488
4ef129285f Fix a bit more stuff 2017-08-24 16:34:45 +07:00
Dragon2488
1dc8601cb4 Error fixes 2017-08-24 16:10:40 +07:00
Dragon2488
1ad610feab Some changes to MetaItems 2017-08-24 15:36:17 +07:00
Dragon2488
5381132780 Blocks list 2017-08-24 15:31:09 +07:00
Dragon2488
ba490c58dd GTUtility work 2017-08-24 14:26:31 +07:00
Exidex
3c90a6ecab Comment out a lot of stuff. 2017-08-23 22:15:46 +02:00
Exidex
93aa95dbc9 Armor, Combs, Pollution and Worldgen Archived 2017-08-23 15:52:53 +02:00
Exidex
d1058a5d78 Working on ModHandler (cont.) 2017-08-23 15:26:17 +02:00
Dragon2488
7888a67a11 Blocks finished, machine block rewrite 2017-08-23 17:43:57 +07:00
Dragon2488
f13bbcce9a Merge remote-tracking branch 'hub/1.10.2' 2017-08-23 14:01:49 +07:00
Dragon2488
8a4f482674 Implemented OreBlock, model generation for it, Some changes to blocks 2017-08-23 14:01:41 +07:00
Exidex
e0a10cab7b Staff and things. 2017-08-22 22:51:35 +02:00
Exidex
46445a23c5 Working on ModHandler 2017-08-22 15:54:44 +02:00
Dragon2488
93a1bd3d2c Archived old stuff (jei, tileentities, covers, gui) 2017-08-22 18:36:19 +07:00
Dragon2488
8f8ee2e523 SlotWidget 2017-08-22 13:21:31 +07:00
Dragon2488
a11202cb57 And a bit more work 2017-08-21 18:02:42 +07:00
Dragon2488
050c2efc16 ModularUI implementation for MetaTileEntities 2017-08-21 17:40:15 +07:00
Dragon2488
2b9cca88f8 some description 2017-08-21 17:23:34 +07:00
Dragon2488
43dcc2cec2 Merge remote-tracking branch 'hub/1.10.2' 2017-08-21 17:18:31 +07:00
Dragon2488
e15976ef44 Wow, modular UI system base implementation finish! 2017-08-21 17:18:15 +07:00
Exidex
6e995e3295 MetaItems 2017-08-20 18:46:55 +02:00
Dragon2488
f977d9ff17 Some modular UI work 2017-08-20 18:44:39 +07:00
Dragon2488
f02a7b0c98 Start of something big 2017-08-19 14:07:30 +07:00
Exidex
df7b74329f Tools localization 2017-08-18 22:07:27 +02:00
Exidex
47056cc07e oops 2017-08-18 19:47:43 +02:00
Exidex
3507aaa49f Material localization 2017-08-18 19:40:27 +02:00
Exidex
03a1656637 MetaItems localization 2017-08-18 15:57:24 +02:00
Exidex
507207e50f OrePrefixes localization 2017-08-18 09:10:09 +02:00
Dragon2488
54fd9fd9c4 oops 2017-08-18 13:47:35 +07:00
Dragon2488
25586e8300 little bit more model & material block work 2017-08-18 13:47:14 +07:00
Dragon2488
e485119e87 Merge remote-tracking branch 'hub/1.10.2' 2017-08-17 18:55:38 +07:00
Dragon2488
5135a3f819 block models & more 2017-08-17 18:54:13 +07:00
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