Commit Graph

150 Commits

Author SHA1 Message Date
9a69e0c15a some other fixes 2016-07-21 18:28:35 +02:00
3251370335 thia time its another pain 2016-07-21 18:23:45 +02:00
57fe4b6070 ext is a real pain 2016-07-21 18:20:47 +02:00
00e5ca976f fixed some derps 2/x 2016-07-21 18:12:54 +02:00
fa777ca6e0 fixed some derps 2016-07-21 18:08:55 +02:00
a3f53b1593 fixed some stuff in automate builds 2016-07-21 18:03:29 +02:00
Robert Sosnitzka
d46ca78bd5 Merge remote-tracking branch 'origin/master' 2016-07-21 17:29:52 +02:00
Robert Sosnitzka
be1f4fc446 Fixed and balanced traits. Fixed bug where block could not be broken sometimes. Fixed missing Ores. Fixed translation. 2016-07-21 17:29:09 +02:00
Robert Sosnitzka
ddff7fe973 Merge pull request #7 from StevenTheEVILZ/patch-1
Fix misspelling of Adamantite
2016-07-20 20:01:32 +02:00
StevenTheEVILZ
835139a562 Fix misspelling of Adamantite 2016-07-20 12:59:07 -05:00
Robert Sosnitzka
768290f758 Fixed frequency of cascade effect in trait cascade 2016-07-20 13:13:53 +02:00
69f2904088 removed tickhandler for now 2016-07-20 13:02:13 +02:00
2ef3bc1dd4 fixed last derps with automated building 2016-07-20 05:17:05 +02:00
64f19a9741 added automatic jenkins build & upload 2016-07-20 04:41:22 +02:00
ca01fd8fc8 Refreshed gradle wrapper files 2016-07-20 03:43:14 +02:00
Robert Sosnitzka
db49a2c74e Adjusted tiberium ore, removed vanilla smelting recipes, adjusted three traits (one left), description for materials added 2016-07-20 01:41:39 +02:00
74e3baa05c first implementaion of a custom TickHandler 2016-07-19 13:18:41 +02:00
Robert Sosnitzka
7a72051cb4 Fixed oreDictionary for blocks 2016-07-19 01:28:13 +02:00
Robert Sosnitzka
e1bd649066 Fixed oreDictionary entries for slaggoldOre and slagironOre. 2016-07-19 01:26:45 +02:00
Robert Sosnitzka
0bcf9d2fd1 Fixed oreDictionary entries for iron nugget, slag gold and slag iron. 2016-07-19 01:15:50 +02:00
Robert Sosnitzka
0fba304754 Added oredict entry for iron nugget 2016-07-19 01:05:21 +02:00
8a5eca2b00 fixed load dependency order, fixes #1 #2
bumped version up to 1.0.1
2016-07-19 00:49:37 +02:00
Robert Sosnitzka
bac0955b44 Fixed Lignite and its registration, added 2 more variants - same texture. 2016-07-19 00:46:29 +02:00
Robert Sosnitzka
114cb69985 Merge pull request #5 from Zkaface/revert-4-master
Revert "Added config for ore generation"
2016-07-18 23:08:28 +02:00
Robert Sosnitzka
1fb028bdcc Revert "Added config for ore generation" 2016-07-18 23:06:28 +02:00
Robert Sosnitzka
d6e66df5a3 Merge pull request #4 from ConnorRowe/master
That would need a big rewrite, caused of alloys depending on registered materials and could possibly destroy the usability, when there is no suitable tool with corresponding level.
2016-07-18 23:06:25 +02:00
ConnorRowe
2a54574d2d Added config for ore generation 2016-07-18 21:18:48 +01:00
d4ff6dd9b8 readded resources (derp from @zkaface, again!)
fixed some stuff in the readme
2016-07-18 18:42:05 +02:00
Robert Sosnitzka
389c35b1a5 fixed readme 2016-07-18 18:31:42 +02:00
Robert Sosnitzka
351fe666fe set to 1.0 2016-07-18 18:20:26 +02:00
Robert Sosnitzka
47a9cfa077 fixed Readme 2016-07-18 17:48:47 +02:00
Robert Sosnitzka
1c88c2ec57 Read.Me! 2016-07-18 17:35:08 +02:00
Robert Sosnitzka
7076f2a80f Merge remote-tracking branch 'origin/master' 2016-07-18 16:23:52 +02:00
Robert Sosnitzka
5b011224be Fixed link to github 2016-07-18 16:23:41 +02:00
Giovanni Harting
7c0a614daf added licence 2016-07-18 16:22:23 +02:00
Robert Sosnitzka
1b2ef4708b Corrected name 2016-07-18 16:18:50 +02:00
Robert Sosnitzka
7515737cb4 Project renamed to "TAIGA: Tinkers alloying addon" 2016-07-18 16:04:37 +02:00
c72689b68a general code cleanup 2016-07-18 00:20:40 +02:00
Robert Sosnitzka
302ef6cccb Final adjustments, 2 additional traits, 1 trait rewritten. Liquids + textures included. German and english translation added. 2016-07-18 00:16:46 +02:00
77e86d4281 merged fluid_blocks 2016-07-16 22:37:12 +02:00
9800f7ce8c fixed fluid blocks, just need to add all into the JSON @Zkaface 2016-07-16 22:34:23 +02:00
Robert Sosnitzka
008e26b575 Rest of names fixed! 2016-07-16 13:31:17 +02:00
Robert Sosnitzka
83621749ab Fixed missing and wrong positioned names 2016-07-16 12:52:46 +02:00
Robert Sosnitzka
615d8a4714 Fixed missing and wrong positioned names 2016-07-16 02:05:14 +02:00
Robert Sosnitzka
c0ff755a50 Fixed density, viscosity and temperature of materials and their smelting. 2016-07-15 23:44:45 +02:00
Robert Sosnitzka
6e82e03ce5 Last traits added. Renamed most Items, Blocks & Traits. 2016-07-15 23:25:32 +02:00
a41dffd0c5 upgraded to mc 1.10.2 with rec. forge 2016-07-14 15:32:06 +02:00
Robert Sosnitzka
a13131adc9 Lot of traits! 2016-07-14 15:12:52 +02:00
Robert Sosnitzka
b11e69af7c Added separate handle and head traits for several materials, to specify them more. 2016-06-29 16:47:05 +02:00
Robert Sosnitzka
7944530375 Fixed trait 'haunted' to be more fun and useful! 2016-06-28 21:40:12 +02:00