upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-25 20:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,618 Commits 6 Branches 321 Tags
52f603e4a1c6e9143dba6ce58830a6f5eca832c8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach fbf7720a05 remove println 
Cherry-picked from 3f10d07849d3324a87a297fcc7bed5b63ac00e20
 2014-08-28 01:28:03 -07:00
progwml6 a5d7260c1f update mantle, autogenerate the configs for pulsar modules 2014-07-02 21:10:56 -04:00
progwml6 75ea8723ee update pulsar handling to use pulsars autogenerated configs 
use .cfg file for tcon -- legacy one should be renamed if it is the only one present
only save config files if they have actually changed
 2014-06-30 21:52:31 -04:00
Progwml6 63b740eacd restore te3 recipe plugin 2014-05-10 17:28:30 -04:00
Progwml6 546cc2198e bump forge/mantle versions, restore waila integration 2014-05-10 16:50:27 -04:00
Zach 6b51e9c072 Merge pull request #648 from blue42u/patch-all-the-things 
Fix the chisel, achieves, punji...
 2014-05-09 14:04:22 -04:00
Zach 4399b4f26e Merge pull request #642 from vanzomerenc/patch-1 
fix pigiron/glue buckets (resolves issue #639)
 2014-05-08 22:50:31 -04:00
Zach 6dc00b0dea register all toolrods to new rod names as well 2014-05-07 23:50:23 -04:00
Zach e63bd86f37 use newer ore dict names for tool rod 2014-05-07 23:36:51 -04:00
Zach d098855846 Merge pull request #637 from Adaptivity/patch-4 
For 1.7.x
 2014-05-03 13:55:07 -04:00
Progwml6 7528d0819e restore NEI integration 2014-05-03 10:39:36 -04:00
Zach 8e3e5ee611 Merge pull request #633 from blue42u/patch-myderp 
I Derped.
 2014-05-01 10:40:44 -04:00
Zach 2f848313f9 Merge pull request #631 from blue42u/patch-armor 
Fix the TPlayerStats disappearence!
 2014-04-30 11:12:20 -04:00
Zach 801a514ae3 Merge pull request #627 from blue42u/patch-exoderp 
Fixing the Exo-Derp
 2014-04-29 09:57:48 -04:00
Zach 14b9541deb Merge pull request #628 from blue42u/patch-singot 
Fix the casting glitch
 2014-04-29 09:57:26 -04:00
Zach 330fc168fd Merge pull request #624 from blue42u/patch-fancyredstone 
Fix redstone for fancy bricks
 2014-04-29 06:51:03 -04:00
Zach 1c3626b4a9 Merge pull request #625 from blue42u/patch-achieve 
Fixed achievements
 2014-04-29 06:50:41 -04:00
Zach 044329658e Merge pull request #621 from TheVikingWarrior/patch-7 
Update it_IT.lang
 2014-04-26 10:37:03 -04:00
Progwml6 24f682c6c9 add AT for diyo 2014-04-19 19:15:56 -04:00
Zach ea3dcc4048 Merge pull request #604 from Mexahoid/patch-2 
Update ru_RU.lang
 2014-04-18 20:12:26 -04:00
Zach 16eab84219 Merge pull request #607 from Zerokyuuni/master 
Add enderblock to oredict for 1.7.2
 2014-04-18 20:11:53 -04:00
Zach 44679e29a4 change config value to default from feature branch 2014-04-18 00:59:36 -04:00
Progwml6 222bcc894e clean up some issues with missed quotes in PR 2014-04-17 01:03:24 -04:00
Zach 9e1a1b3535 Merge pull request #592 from TheVikingWarrior/patch-2 
More localization
 2014-04-17 00:34:31 -04:00
Progwml6 ccdeeaa537 restore FMP integration minus connected textures (still WIP) 2014-04-16 04:46:22 -04:00
Zach 8c51fa07bd Merge pull request #578 from TheVikingWarrior/patch-11 
Update it_IT.lang
 2014-04-13 12:11:23 -04:00
Progwml6 780387a6d5 update old capes file to use copies of images in new repo, and remove cape assets 2014-04-11 02:01:07 -04:00
Zach 8c561fc6e6 capes file moved to new repo, this one is retired 
moved to seperate capes repo... only here for compatability w/ older versions
 2014-04-11 01:52:32 -04:00
Progwml6 34ef094351 remove bucket hack closes #563 2014-04-08 17:56:34 -04:00
Zach e7008e327a Merge pull request #561 from LepkoQQ/master 
Fixup faucets
 2014-04-06 16:51:41 -04:00
Zach b6a785a809 Merge pull request #560 from TheVikingWarrior/patch-9 
Update it_IT.lang
 2014-04-06 15:58:58 -04:00
Progwml6 0241e5273c sysout no good 2014-04-03 15:29:13 -04:00
Progwml6 c7a508beda adjust glass ore dict values, fix issue where wrong hearts were dropping 2014-04-02 22:49:37 -04:00
Zach d8a36ca967 Merge pull request #549 from Mexahoid/patch-1 
Update ru_RU.lang
 2014-03-30 22:44:51 -04:00
Progwml6 46aa5a0fb5 fix npe in potionlauncher closes #537 2014-03-28 01:37:13 -04:00
Zach 82cacb0b6e Merge pull request #539 from Glassmaker/patch-3 
Fix for Harvest tools speed issues
 2014-03-19 13:37:23 -04:00
Progwml6 691f739fb3 fix build errors 2014-03-16 09:59:15 -04:00
Progwml6 49230e9d5c Merge branch 'squash' 2014-03-15 07:34:03 -04:00
Progwml6 5bf1470090 port in everything from 1.6 but labotimizetools(will do that later this weekend) 2014-03-15 07:33:08 -04:00
Progwml6 109563f926 port in everything from 1.6 but labotimizetools(will do that later this weekend) 2014-03-15 07:13:29 -04:00
Progwml6 66a4ece284 port in everything from 1.6 but labotimizetools(will do that later this weekend) 2014-03-15 07:11:06 -04:00
Progwml6 aa8d70d4c4 apply 1.6 fix to smeltery book page overrun 2014-03-15 06:20:35 -04:00
Zach ca4dfc60e2 Merge pull request #529 from Vexatos/patch-2 
Update de_DE.lang
 2014-03-12 20:54:03 -04:00
Zach 21c851a6f9 Merge pull request #524 from wodkashorty/patch-1 
Update de_DE.lang
 2014-03-12 06:02:38 -04:00
Zach f7870e71fc Merge pull request #518 from darknesswind/patch-1 
Update zh_CN.lang
 2014-03-12 05:56:36 -04:00
Progwml6 2d70dab874 add AT entry for tesselator.isDrawing for a depending mod 2014-03-11 15:30:54 -04:00
Zach 77b31c56e2 Merge pull request #522 from TheVikingWarrior/patch-5 
Update CraftingStationGui.java
 2014-03-09 14:37:29 -04:00
Zach a0080e70fb add jade and myrathi to capes list 2014-03-09 01:44:06 -05:00
Progwml6 6046c24e2d send the description packet from the server as this is a server sided method 2014-03-08 20:01:59 -05:00
Progwml6 24003e588a fix for networking related method not found on server in smeltery logic 2014-03-08 18:51:19 -05:00
Zach 9d5fc07c04 fix NPE in armorextended 2014-03-07 16:09:24 -05:00
Zach ebc62c8107 Merge pull request #516 from portablejim/inventoryFixes 
Make TPlayerStats an IExtendedEntityProperties + associated changes
 2014-03-06 16:26:23 -05:00
Progwml6 cc2aeb82e0 remove battle gear 2 compat as its impossible to support mods w/ constantly changing API's 2014-03-06 02:08:35 -05:00
Zach cb43dca6dc Merge pull request #511 from TheVikingWarrior/patch-8 
Update it_IT.lang
 2014-03-03 17:10:59 -05:00
Progwml6 3def2da628 send Fluid ID packet should solve crash when clicking on fluid in smeltery gui 2014-03-03 16:58:38 -05:00
Progwml6 5b81260b05 make sure that empty hand's don't cause NPE's in the even handler 2014-03-01 21:44:33 -05:00
Progwml6 9b4b59adbd update to use mantle's texture domain for inventory blocks 
WARNING: USERS MUST!!! update mantle to use this build
 2014-02-27 15:27:44 -05:00
Zach 7b8483e60d Merge pull request #503 from portablejim/armourGuiOpen2 
Fix opening of GUIs (with client/server sync) and fix Knapsack gui.
 2014-02-26 11:52:55 -05:00
Zach 548c12dc22 Merge pull request #501 from portablejim/armourGuiOpen 
Fix opening and placement of armour GUI
 2014-02-26 00:24:50 -05:00
Zach 66ce0e8a0c Merge pull request #500 from portablejim/keybindCrashFix 
Fix crash when going into Controls
 2014-02-25 20:35:31 -05:00
Progwml6 f2d4b48a98 partial fix for sided issues w/ armor synch packets 2014-02-25 20:23:00 -05:00
Progwml6 d6372a79ae pull in extra heart stuffs from 1.6 warning: probably will fail serverside 2014-02-25 19:48:18 -05:00
Progwml6 92a813e6ca pull in new logic from 1.6 for casting channels should solve class cast error from forum 2014-02-25 14:33:56 -05:00
Progwml6 e227f23e75 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2014-02-24 16:38:08 -05:00
Progwml6 5d06206029 fix derp w/ furnace recipes 2014-02-24 16:36:08 -05:00
Zach be75ae6bd5 Merge pull request #499 from Cisien/patch-3 
BC Facades update.
 2014-02-23 19:09:05 -05:00
Progwml6 977db5299d icons for books should be stored in mantle not tcon 2014-02-23 15:36:32 -05:00
Progwml6 36bae9bd81 environment keystore pass overrides buildscript 2014-02-23 02:04:59 -05:00
Progwml6 31760e877a switch dep for sftp, fix the issue w/ jar signing on linux 2014-02-23 02:01:25 -05:00
Progwml6 7ba9277b38 add missing comma to signing stuffs 2014-02-23 01:42:18 -05:00
Progwml6 f58796bd4c feed in key pass to appease linux 2014-02-23 01:40:35 -05:00
Progwml6 37ba5fe41a try to debug signing acting up 2014-02-23 01:06:56 -05:00
Progwml6 f3600acbb9 log location of jar that's being signed 2014-02-23 00:59:35 -05:00
Progwml6 beab1ad274 more work on remote deploy stuff 2014-02-23 00:54:47 -05:00
Progwml6 2d5dc63f0f try to fix remote deploy error 2014-02-23 00:49:31 -05:00
Progwml6 4079c0ddbe update gradle stuffs in prep for deploying up to tanis 2014-02-23 00:40:58 -05:00
Progwml6 e126096c1a use cisien's implementation of fix method isnt needs serverside 2014-02-22 20:45:25 -05:00
Zach 9a61de0941 Merge pull request #496 from Cisien/patch-2 
Additional null check on stats.armor
 2014-02-22 19:48:56 -05:00
Progwml6 96dcde4483 fix for server sided crash reported on forum 2014-02-22 19:38:26 -05:00
Zach 9874908e97 Merge pull request #493 from bculkin2442/master 
Fixing of various bugs
 2014-02-21 10:17:40 -05:00
Progwml6 bc19758fee manually handle lava bucket b/c of forge issue 2014-02-21 07:55:07 -05:00
Progwml6 d470384975 change API logger to log4j2 2014-02-21 07:55:07 -05:00
Progwml6 eec14481c7 remove remnants of drawbridge registries.. have been moved to TMech 2014-02-21 07:55:06 -05:00
Zach 745ba8dbaf Merge pull request #490 from bculkin2442/master 
Fixed manuals
 2014-02-21 07:34:55 -05:00
Zach 3453714733 Merge pull request #488 from alexbegt/master 
Fix some more bugs.
 2014-02-20 15:41:32 -05:00
Progwml6 5d8f03ce0d manually handle lava bucket b/c of forge issue 2014-02-20 15:03:12 -05:00
Progwml6 38dee74ac8 change API logger to log4j2 2014-02-20 14:20:02 -05:00
Progwml6 5c4d01f5d0 remove remnants of drawbridge registries.. have been moved to TMech 2014-02-20 12:40:03 -05:00
Progwml6 e5882901e1 part one of moving books over fully to new mantle interfaces 2014-02-17 21:34:34 -05:00
Zach f7e4fc27a9 Merge pull request #487 from alexbegt/master 
Fix getIcon for servers
 2014-02-17 15:30:53 -05:00
Zach 4ec688e859 Merge pull request #486 from alexbegt/master 
Fix some NBT errors
 2014-02-17 15:11:59 -05:00
Zach fa49ead3b6 Merge pull request #485 from alexbegt/master 
Fix some bugs with the way Gui's work.
 2014-02-17 01:28:15 -05:00
Progwml6 e539d5bf99 bump mantle 2014-02-17 01:16:45 -05:00
Zach af6c319bbe Merge pull request #484 from alexbegt/master 
Doing code cleanup.
 2014-02-17 00:37:32 -05:00
Zach 583756bc5f Merge pull request #482 from alexbegt/master 
Fix the Smeltery WorldGen Again :D
 2014-02-16 16:22:27 -05:00
Zach ad63656c4a Merge pull request #481 from alexbegt/master 
Upload my Code Changes/Format/imports
 2014-02-16 14:28:50 -05:00
Progwml6 20eafc2cd6 merge/ comment out some armor ticking code for now to prevent NPE's 2014-02-16 00:04:38 -05:00
Progwml6 76e700d4f9 Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct 2014-02-15 13:38:18 -05:00
Zach f6b6564895 Merge pull request #477 from Glassmaker/patch-3 
Patch 3
 2014-02-15 13:08:26 -05:00
Progwml6 040d0515f6 restore facade support 2014-02-15 12:56:25 -05:00