Commit Graph
3159 Commits
Author SHA1 Message Date
Martin Robertz ca0e6c5385 Merge pull request #12 from Kortako/1.7.10
Tinkers bows in Battlegear slots
1.8.9.10-GTNH 1.8.9.10
2018-02-22 07:08:16 +01:00
Kortako a15044c435 Tinkers bows in Battlegear slots #2491
Added ability to equip Tinker's bows/crossbow/throwables to Battlegear slots.  Bows will only look in the same offhand, or the main inventory for ammo.
https://github.com/GTNewHorizons/NewHorizons/issues/2491
2018-02-21 05:51:18 -08:00
Dream-Master 3792e46da3 bump version 1.8.9.9-GTNH 2018-01-30 09:36:04 +01:00
Martin Robertz a930dd84f5 Merge pull request #11 from GTNewHorizons/null_check
Add a null check in case there is no current equipped item
2018-01-30 09:01:35 +01:00
Jason Mitchell 14543da225 Add a null check in case there is no current equipped item 2018-01-29 22:31:02 -08:00
Dream-Master 9387e21f50 bump version 1.8.9.8-GTNH 2018-01-25 19:11:19 +01:00
Martin Robertz 164591dd4c Merge pull request #10 from bartimaeusnek/patch-1
Changed Dependencies to prevent missing "tile.unlitTorch_Stone" errors.
2018-01-24 17:55:22 +01:00
bartimaeusnek 13ac69b9ec Changed Dependencies to prevent missing "tile.unlitTorch_Stone" errors.
Let it load before GalacticraftCore
2018-01-24 14:59:17 +01:00
Dream-Master 6ea04ac29b bump version 1.8.9.7-GTNH 2018-01-01 20:00:47 +01:00
Martin Robertz 3ad6d93ad8 Merge pull request #9 from GTNewHorizons/lumberaxe_modifier_fix
Whoops, left this out.
2018-01-01 19:27:56 +01:00
Jason Mitchell d536b1077e Whoops, left this out. 2018-01-01 10:24:53 -08:00
Teteros bd5c5e4f75 Enable CI caching
Might make builds a bit faster
2017-12-26 12:52:16 +00:00
Teteros bcda02a8cb Renew travis api_key 2017-12-26 12:26:09 +00:00
Teteros 8c41439615 Update .travis.yml 2017-12-26 12:19:49 +00:00
Martin Robertz b7b286c468 Merge pull request #8 from GTNewHorizons/backport_lumberaxe
Backport lumberaxe tree chop task from master
1.8.9.6-GTNH
2017-12-22 21:26:45 +01:00
Jason Mitchell cbf65f18d6 Bump version and source compat to 1.7 instead of 1.8 2017-12-22 11:08:58 -08:00
Jason Mitchell d748363176 Backport lumberaxe tree chop task from later versions 2017-12-22 10:34:32 -08:00
Dream-Master b99a30ccbc bump version 1.8.9.5-GTNH 2017-08-31 22:29:00 +02:00
Dream-Master 5b2865b555 possible fix of 1.5.1.0 Wither skull drop #1833 2017-08-31 22:28:34 +02:00
Dream-Master b200b5f9b0 bump version 1.8.9.4-GTNH 2017-03-22 16:17:02 +01:00
Technus 7a49754f3b Working fix 2017-03-22 00:04:27 +01:00
Technus 70d1b12e18 Revert "Probable solution"
This reverts commit de0edc7d36.
2017-03-21 23:49:30 +01:00
Technus 88fb8f0f3f Revert "Attempt2"
This reverts commit c1fbbded90.
2017-03-21 23:49:22 +01:00
Technus db8264fbf2 Revert "Attempt3"
This reverts commit 324835a3f1.
2017-03-21 23:49:11 +01:00
Daniel 324835a3f1 Attempt3 2017-03-21 23:10:50 +01:00
Daniel c1fbbded90 Attempt2 2017-03-21 23:03:03 +01:00
Dream-Master 4e81ba78a1 Merge branch 'Technus-patch-1' into 1.7.10 1.8.9.3-GTNH 2017-03-20 19:38:20 +01:00
Martin Robertz 82712ceab1 Update build.properties 2017-03-20 19:35:34 +01:00
Martin Robertz bd0edc31d9 Update build.properties 2017-03-20 19:33:50 +01:00
Martin Robertz c372301e2c Merge pull request #4 from GTNewHorizons/Technus-patch-1
Probable solution
2017-03-20 10:34:23 +01:00
Daniel de0edc7d36 Probable solution 2017-03-20 08:16:41 +01:00
Dream-Master 173a441156 bump version 1.8.9.2-GTNH 2017-03-08 18:34:45 +01:00
Martin Robertz 0bcb3bee59 Merge pull request #3 from Ugachaga/patch-2
SoulBound support for additional TC slots
2017-03-08 11:07:39 +01:00
Ugachaga fec73ec498 SoulBound support for additional TC slots
(Travellers Belt and such)
2017-03-08 12:17:48 +07:00
Dream-Master d3a7a48985 try this 2017-02-08 21:00:04 +01:00
Dream-Master d133df9f11 Create a config option for gold cast recipes
If "Remove Gold Cast Recipes" config setting is enabled, it will force the use of the only other material to make casts: aluminum.
All gold casts are back if set to false, of course.

Conflicts:
	.travis.yml
	build.properties
1.8.9.1-GTNH
2017-02-08 18:34:10 +01:00
Dream-Master b26a88c6af bump version 2017-02-08 18:31:33 +01:00
Dream-Master 324f62706c Merge commit '8cc4df9c790ff38adc9fb43d517a9c4392da436d' into 1.7.10 2017-02-08 18:30:08 +01:00
Dream-Master f3e6ce9565 gitignore 2017-02-08 18:23:09 +01:00
Martin Robertz 41ed9bd86f Merge pull request #2 from Ugachaga/patch-1
Added forbidden dimension config
2017-02-08 13:45:18 +01:00
Ugachaga 0f08fd1112 Added forbidden dimension config 2017-02-08 17:05:04 +07:00
Teteros ea676774aa Create a config option for gold cast recipes
If "Remove Gold Cast Recipes" config setting is enabled like so: https://github.com/GTNewHorizons/NewHorizons/commit/723e05e85d97e3e9206c5f3800564db26f1b41ea
It will force the use of the only other material to make casts in Tinkers' Construct, Aluminum.
All gold casts are back if set to false of course.
2016-03-10 03:10:04 +00:00
Teteros 8cc4df9c79 If "Remove Gold Cast Recipes" config setting is enabled like so: https://github.com/GTNewHorizons/NewHorizons/commit/723e05e85d97e3e9206c5f3800564db26f1b41ea
It will force the use of the only other material to make casts in Tinkers' Construct, Aluminum.
All gold casts are back if set to false of course.
2016-03-10 03:06:04 +00:00
Teteros 222b048aae Add travis-ci and update gradle 2016-03-10 03:05:13 +00:00
Teteros ba97ba5b5b Done testing both travis and TiC config code. 1.8.9-GTNH 2016-03-05 13:16:54 +00:00
Teteros e50cb9210b CodeCov only then 2016-03-05 11:29:16 +00:00
Teteros a4215d76b4 Create a config option for gold cast recipes
If "Remove Gold Cast Recipes" config setting is enabled, it will force the use of the only other material to make casts: aluminum.
All gold casts are back if set to false, of course.
2016-03-05 11:05:32 +00:00
boni 9ea7a0e60f Merge pull request #1841 from Nincraft/master
Refactor pattern costs to allow being overridden
2015-12-23 21:11:21 +01:00
UndeadZeratul cd5a3ddae6 Refactor pattern costs to allow being overridden
By default the values will still remain the same, but if someone else wants to adjust these values, they can.
2015-12-22 13:07:32 -06:00
boni 8cfaa53e0b Merge pull request #1829 from Cronosus/patch-3
Update cs_CZ.lang
2015-12-06 17:25:46 +01:00