Commit Graph

163 Commits

Author SHA1 Message Date
Robert Sosnitzka
e28524864d Corrected rest of generated material textures. 2016-07-24 22:42:25 +02:00
Robert Sosnitzka
eb1eaf3fd7 Cleaned code. Added nugget icons. Fixed some textures. TODO: metal texture rendering 2016-07-24 20:52:57 +02:00
adef051ff7 removed "limiting" implementation of @Zkaface, was just plain wrong 2016-07-24 07:41:25 +02:00
5ccc94e73a removed class not needed 2016-07-24 07:08:55 +02:00
Giovanni Harting
6777030d57 Merge pull request #16 from StevenTheEVILZ
Add documentation and fix book icons
2016-07-24 06:51:19 +02:00
StevenTheEVILZ
c4f8ffc2b9 Add documentation and fix book icons 2016-07-22 10:42:33 -05:00
Robert Sosnitzka
87d33ee9a1 Rebalanced Tiberium. 2016-07-22 01:22:40 +02:00
Robert Sosnitzka
1a2e0f233b adamantite_nugget.json was corrupted 2016-07-22 00:51:39 +02:00
Robert Sosnitzka
374f1f1d24 Added nuggets + json files. F
Removed unnecessary lignite ores.
Fixed oreDict
2016-07-22 00:44:17 +02:00
6a932e6e56 fixed some envs 2016-07-21 19:15:03 +02:00
181fdc196e another approach to the automated building 2016-07-21 19:06:07 +02:00
fbdb595cd7 now or never: fixed automated building 2016-07-21 18:50:42 +02:00
e3576cc07e some other fixes /2 2016-07-21 18:33:23 +02:00
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