 Bernhard Bonigl
|
a1bde95c36
|
Merge branch 'master' into experimental
|
2014-12-04 19:26:11 +01:00 |
|
|
Bernhard Bonigl
|
1941ddbf53
|
Fix liquid clicking for smelteries with 4-column GUI
|
2014-12-04 19:25:58 +01:00 |
|
|
Bernhard Bonigl
|
ee9e2a3ca2
|
Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct
|
2014-12-04 19:16:36 +01:00 |
|
|
Bernhard Bonigl
|
f8a0520f35
|
Possible fix for the endless recursions that sometimes seem to happen with AOE tools. #1213
|
2014-12-04 19:16:14 +01:00 |
|
|
boni
|
d4d859b71b
|
Merge pull request #1203 from TheTemportalist/master
Fixed possible NPE
|
2014-12-04 16:14:05 +01:00 |
|
|
Bernhard Bonigl
|
43b1c35668
|
Merge branch 'master' into experimental
|
2014-12-03 21:30:51 +01:00 |
|
|
Bernhard Bonigl
|
855b58f01b
|
Fix Tool Station allowing to rename anything #1211
|
2014-12-03 21:30:15 +01:00 |
|
|
Bernhard Bonigl
|
d16acb6846
|
Tinker arrows/bolts/shuriken/throwingknives/javelins now work with dispensers :OOoo
|
2014-12-03 21:26:32 +01:00 |
|
|
Bernhard Bonigl
|
429c3b7fb7
|
Remove the dispenser behaviour for the old arrows
|
2014-12-03 20:58:07 +01:00 |
|
|
Bernhard Bonigl
|
d2b06da1ec
|
The piercing damage of arrows/bolts doesn't determine whether an entity has been hit anymore (since it always hits since it's unblockable)
|
2014-12-03 20:57:28 +01:00 |
|
|
Bernhard Bonigl
|
791fe9494f
|
Fix lavatank canFill not respecting liquids in tank #1208
|
2014-12-03 10:40:08 +01:00 |
|
|
Bernhard Bonigl
|
011298e0b8
|
Experimenta: native FMP support for the bocks *sawsaw*
|
2014-12-02 21:34:31 +01:00 |
|
|
Bernhard Bonigl
|
c4d9ebd505
|
Add a possibly missing rendering state reset
|
2014-12-02 21:03:01 +01:00 |
|
|
Bernhard Bonigl
|
ee980ccca0
|
Merge branch 'master' into experimental
Conflicts:
resources/assets/tinker/lang/en_US.lang
|
2014-12-02 20:43:56 +01:00 |
|
|
Bernhard Bonigl
|
ea875724bd
|
Add nugget cast and nugget casting
|
2014-12-02 20:42:47 +01:00 |
|
|
Bernhard Bonigl
|
007c1a457c
|
Merge branch 'master' into experimental
|
2014-12-02 16:18:15 +01:00 |
|
|
Bernhard Bonigl
|
3e0c4f5e0e
|
Fix tanks not implementing fluid-api properly. canDrain/canFill #1208
|
2014-12-02 15:28:52 +01:00 |
|
|
Bernhard Bonigl
|
8623b0978b
|
Fix server-crash on king silme death #1209
|
2014-12-02 15:26:23 +01:00 |
|
|
Bernhard Bonigl
|
af6fbec293
|
Battlesign reflecting takes durability and doesn't work while it's broken
|
2014-11-30 14:34:28 +01:00 |
|
|
Bernhard Bonigl
|
49813550b4
|
Change battlesign-blocking to actually require you to look at the arrow + reflection speed depends on how much you looked at it (+buffed)
|
2014-11-30 14:20:41 +01:00 |
|
|
Bernhard Bonigl
|
076b66be10
|
Merge branch 'master' into experimental
|
2014-11-30 14:04:39 +01:00 |
|
|
Bernhard Bonigl
|
d089455063
|
Separate BlueSlime and King Slime into separate entities + baseclass
|
2014-11-29 23:02:23 +01:00 |
|
|
TheTemporatlist
|
5f725cb971
|
Fixed possible NPE
|
2014-11-28 13:26:32 -05:00 |
|
|
Bernhard Bonigl
|
345704f8dd
|
Fix Material IMC Jagged being inverted
|
2014-11-28 15:06:20 +01:00 |
|
|
Bernhard Bonigl
|
5187f3bb31
|
Restore Tic-Tooltips compatibility so it doesn't crash anymore with new stuff
|
2014-11-28 14:37:49 +01:00 |
|
|
Bernhard Bonigl
|
e47b570915
|
Merge branch 'master' into experimental
|
2014-11-26 22:37:25 +01:00 |
|
|
Bernhard Bonigl
|
dc3a2b0ff7
|
Battlesigns now properly reflect all projectiles, not just arrows.
|
2014-11-26 22:37:08 +01:00 |
|
|
Bernhard Bonigl
|
b861a114ca
|
Allow Thaumometers to be added to travellers goggles.
1 Thaumometer = see nodes
2 Thaumometers = like the goggles of revealing
You can upgrade from 1 to 2 thaumometers.
|
2014-11-26 20:57:08 +01:00 |
|
|
Bernhard Bonigl
|
920edde7fd
|
Force-enable all the modcompat plugins since they can be disabled by default if the mod wasn't present on config creation
|
2014-11-26 17:36:01 +01:00 |
|
|
Bernhard Bonigl
|
6ea64191e1
|
Merge branch 'master' into experimental
|
2014-11-25 21:45:57 +01:00 |
|
|
Bernhard Bonigl
|
e1101fa412
|
Fix inventory desync when activating drying rack/basin/oreberry
|
2014-11-25 21:45:37 +01:00 |
|
|
Bernhard Bonigl
|
90e5d6af25
|
Remove special inventory-spawn-code in other blocks since it's handled by AbilityHelper now
|
2014-11-25 21:45:18 +01:00 |
|
|
Bernhard Bonigl
|
158ae52dd8
|
Fix OreBerry bushes not returning correct amount on leftclick
|
2014-11-25 21:43:29 +01:00 |
|
|
Bernhard Bonigl
|
aa328792f7
|
Change AbilityHelper.spawnEntityAtPlayer to automatically put items into inventories by default (prevents lag-dupe) and also play sound if it got picked up.
|
2014-11-25 21:42:41 +01:00 |
|
|
Bernhard Bonigl
|
2a275c424e
|
Merge branch 'master' into experimental
|
2014-11-23 23:11:31 +01:00 |
|
|
Bernhard Bonigl
|
6d677dcc7a
|
Port the weird possible casting-block-dupe fix over to the drying rack #1190
|
2014-11-23 18:30:19 +01:00 |
|
|
Bernhard Bonigl
|
5fae9b7ced
|
Thaumium Toolparts for weaponry
|
2014-11-22 23:21:11 +01:00 |
|
|
Bernhard Bonigl
|
ce47cd3c96
|
Fix broken textures not getting colored correctly if a special head-texture is present, but not a broken one
|
2014-11-21 19:34:48 +01:00 |
|
|
Bernhard Bonigl
|
3c7d9f00dd
|
Fix bows replacing the wrong texture when broken
|
2014-11-21 19:34:03 +01:00 |
|
|
Bernhard Bonigl
|
81da6633ed
|
Fix broken bows being usable
|
2014-11-21 19:25:41 +01:00 |
|
|
Bernhard Bonigl
|
eea8d165a4
|
Fix javelin not taking damage on attack if it was full and adding ammo. Oops.
|
2014-11-21 19:16:12 +01:00 |
|
|
Bernhard Bonigl
|
584c2e77f6
|
Add 'metal-part-creation-in-part-table' config to weaponry
|
2014-11-21 18:58:07 +01:00 |
|
|
Bernhard Bonigl
|
40a2e91943
|
Throwing knives now crit when they're aimed long enough
|
2014-11-21 18:50:04 +01:00 |
|
|
Bernhard Bonigl
|
d57f8b64a8
|
Throwing knives windup is shorter and they nearly don't slow you down while doing so.
Also minimal javelin buff.
|
2014-11-21 18:27:33 +01:00 |
|
|
Bernhard Bonigl
|
a44919a2f2
|
Shortbows give less slowdown while aiming
|
2014-11-21 18:26:39 +01:00 |
|
|
Bernhard Bonigl
|
8161d2b493
|
Adjust Thaumium bow-stats
|
2014-11-20 15:42:20 +01:00 |
|
|
Bernhard Bonigl
|
8687296199
|
Bring flamestring in line so it's an actual choice instead of just making normal tools lategame power. Also bring enchanted string in line a bit.
|
2014-11-20 15:40:21 +01:00 |
|
|
Bernhard Bonigl
|
2396c9c21c
|
Prevent crash when hitting ghast-fireballs etc. with tinker projectiles
|
2014-11-20 15:06:16 +01:00 |
|
|
Bernhard Bonigl
|
9af43cbe9e
|
Fix oredicted obsidian melting to 9 ingots instead of 2
|
2014-11-19 11:21:51 +01:00 |
|
|
Bernhard Bonigl
|
7372d0af89
|
Change quartz to be less effective on projectiles
|
2014-11-18 19:40:23 +01:00 |
|