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
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sunstrike 1c70732c68 Fix PR #421 compile failures. 2014-01-16 20:24:32 +00:00
Sunstrike 7024432b30 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-01-08 21:01:40 +00:00
Sunstrike a1700ea570 [build] Gradle wrapper, disable Mantle. 2014-01-08 21:01:19 +00:00
Sunstrike 088aeb4efb [Build] Add suitable settings.gradle 2014-01-08 14:52:22 +00:00
Sunstrike 35b9c8f376 [Preloader] Fix Gradle compile complaint. 2014-01-08 14:42:36 +00:00
Sunstrike 5cdc894dad Move to Maven structure 2014-01-08 14:36:13 +00:00
Sunstrike ad86fccb88 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2014-01-08 14:19:49 +00:00
Sunstrike 396abec2de Gradlise 1.6.x builds for Mantle inclusion 2014-01-08 14:18:48 +00:00
Sunstrike 6f8ca82d98 Waila: Configuration support 2013-12-25 00:24:02 +01:00
Sunstrike bcd73a0cf3 Waila: Add item data to basin casting. 2013-12-24 23:38:14 +01:00
Sunstrike 27277a67e6 Waila: Casting Table support. 2013-12-24 20:56:55 +01:00
Sunstrike 7ff592b4b5 Waila: Casting Basin support. 2013-12-24 20:46:46 +01:00
Sunstrike d19d4d4a0c Update Mantle, further thin TCon env checks, move optifine detection out to Mantle. 2013-12-06 16:57:33 +00:00
Sunstrike 7f57b8b30b 'Fix' funny start messages. 2013-12-06 16:26:36 +00:00
Sunstrike 179f9dfa05 Compact EnvChecks and use Mantle callables. 2013-12-06 16:18:07 +00:00
Sunstrike 34c54a60a9 Update Mantle to 02b512. 
Make crash callables public.
 2013-12-06 16:10:26 +00:00
Sunstrike 46c90ff3c1 Fix localization bug affecting Waila. 2013-12-04 15:37:40 +00:00
Sunstrike 4fe395e99c Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-04 14:58:08 +00:00
Sunstrike 6b4309a675 Maybe slightly too trolly. 
...Keeping the rest though, it's just funny.
 2013-12-04 14:57:48 +00:00
Sunstrike 5010b8f310 Merge pull request #369 from crafteverywhere/patch-3 
Update zh_CN.lang
 2013-12-04 05:57:51 -08:00
Sunstrike 7290be22ab Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-12-03 19:30:36 +00:00
Sunstrike 7776f7f35d (Preloader) Restore getLibraryRequestClass but keep it deprecated. 2013-12-03 19:29:57 +00:00
Sunstrike 0158db7064 Merge pull request #368 from Vexatos/patch-2 
PRs needed to upstream "Languages/German"...
 2013-12-02 14:25:14 -08:00
Sunstrike a181dc9dcf Start IC2 compat. 
...Not. Bwahahah.
 2013-12-01 23:17:22 +00:00
Sunstrike 9ccbe48bfe Fix IFacingLogic using the wrong interface (now in Mantle). 2013-12-01 21:55:04 +00:00
Sunstrike 08fd425c8f Fix wtf code merge. 
Removed extra brackets from StatCollector references (PLEASE check this before PRs), replaced TContent references with TRepo as needed.
 2013-12-01 21:42:03 +00:00
Sunstrike cc241aab67 Abort cloak render with Optifine. 2013-12-01 13:49:48 +00:00
Sunstrike e763bb6363 Move some stuff out into Mantle. 2013-12-01 12:19:43 +00:00
Sunstrike ef70d27bee Update Mantle. 2013-12-01 12:18:50 +00:00
Sunstrike c037a13f18 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-30 19:55:07 +00:00
Sunstrike f68a27be28 Bad Magic Launcher, bad! *whacks* 2013-11-30 19:50:18 +00:00
Sunstrike f3b31b7914 Fix Git not finishing fast enough in build.gradle 2013-11-30 19:09:12 +00:00
Sunstrike 587ba53a36 Change root project ID to match Ant 2013-11-30 18:55:12 +00:00
Sunstrike 5b8311a882 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-11-30 18:47:04 +00:00
Sunstrike 5012c3a60c GITBORK if Git isn't working. 2013-11-30 18:46:53 +00:00
Sunstrike de0a33fcdd Slightly tweak builder output format 2013-11-30 18:23:46 +00:00
Sunstrike 7c68cfbcc5 Update preloader to 0.1.1 
Restore AT function (went missing in a merge), add verbose log toggle, reinforce PropertyManager.
 2013-11-30 17:59:28 +00:00
Sunstrike ec005e14ad Fix recipes crash 2013-11-30 17:57:22 +00:00
Sunstrike f77f89e208 Cleanup dimension blacklist. 2013-11-30 17:06:50 +00:00
Sunstrike ca4f4205d2 Force Mystcraft plugin to load unconditionally. 
This cannot be overridden by TDynstruct.cfg for balance sake.
 2013-11-29 21:10:58 +00:00
Sunstrike dfde917a39 Less noise please. I think the comedy message is sufficient now. 2013-11-29 20:39:07 +00:00
Sunstrike 35367bb1fd Transition old IMC plugins to new compat loader. 
These old ones need to be removed still and all TContent refs need updated in these when refactor occurs.
 2013-11-29 20:33:49 +00:00
Sunstrike 3b3b439cfb Transition to using FML's suggested config file, not Tinkers Workshop.txt 2013-11-29 19:52:03 +00:00
Sunstrike 4698b28179 TDynstruct.cfg can now be used to toggle compat plugins. 2013-11-29 19:46:40 +00:00
Sunstrike bd213f60d9 Silly IDEA and Vim junk... 2013-11-29 19:46:13 +00:00
Sunstrike 6ad0723020 Merge 1.7 prep into master. 
This was one hell of a messy merge; things may very well explode.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>
 2013-11-27 17:46:07 +00:00
Sunstrike ca86fa895a Add InventoryLogic constructor for max stack size, reconf drying rack to use it. 2013-11-25 18:15:40 +00:00
Sunstrike 84e39568f6 Fix Glue IDs (Probably) 
Don't have access to an IDE; another dev can correct it if *this* is wrong too.
 2013-11-24 00:48:38 +00:00
Sunstrike 56438d5162 Merge pull request #349 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2013-11-23 10:19:04 -08:00
Sunstrike 1604aee9fc Merge pull request #348 from VeryBigBro/patch-2 
Update ru_RU.lang
 2013-11-23 08:37:52 -08:00
Sunstrike 5d4ed1842d Update en_US.lang 
Forgot a few localisations.
 2013-11-23 16:26:38 +00:00
Sunstrike 48e0af4346 Merge pull request #347 from VeryBigBro/patch-1 
Update ru_RU.lang
 2013-11-23 08:24:27 -08:00
Sunstrike 0354ce09f1 Make horse melting configurable. 
For the overzealous, the vegetarian and the squeemish. The setting is in Experimental.
 2013-11-23 16:21:40 +00:00
Sunstrike 7a18a41e00 It kills horses? SHIP IT 2013-11-23 16:16:17 +00:00
Sunstrike 3837ecdb45 Glue ingots 2013-11-23 16:09:12 +00:00
Sunstrike decbb7d01f More gluey things. 
Glue blocks can be melted in the smeltery, and casted into blocks with the basin. Buckets too.
 2013-11-23 15:48:19 +00:00
Sunstrike 1387bc6f74 Glue block 2013-11-23 14:09:08 +00:00
Sunstrike 2bf8dc759c Manually merge because of Git derp 2013-11-23 12:58:14 +00:00
Sunstrike b2580cec27 Make Anonymous classes less anonymous 
This shuts up FML, and also means we'll survive a 1.7 upgrade. Maybe. Probably not. Worth a go.
 2013-11-23 12:53:57 +00:00
Sunstrike 7c76f20665 Update EnvironmentChecks.java 2013-11-22 03:44:46 +00:00
Sunstrike 248d8e74ef Oh here we go again Greggy... 
Really? FML? Are you high now? :p
 2013-11-21 23:42:31 +00:00
Sunstrike e5dd0d2423 Make AT active at runtime for Gradle-ised Forges. 2013-11-21 18:38:43 +00:00
Sunstrike cb87c836c8 Initial test of Gradle (not working yet) 2013-11-21 16:13:51 +00:00
Sunstrike 428d5fc002 Merge pull request #330 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2013-11-17 03:37:27 -08:00
Sunstrike a28021cdda Add warning-shot to DragonAPI in EnvChecks. 2013-11-17 11:35:59 +00:00
Sunstrike 3589ccbc62 Burn @Mod Containers in righteous fire. 
Implement a little more sensible plugin system, which interferes with the Mods list less.
 2013-11-16 16:34:38 +00:00
Sunstrike 11697b62b0 Fix build file 
Whoops, I'm awful at this x)
 2013-11-15 21:40:33 +00:00
Sunstrike 2dd7dce44d Unfux build.xml 
Remove prog-grammar, rearrange targets/Forge checks into correct order, fix pack-dev, make pack-dev independant of pack-api, convert all whitespace to spaces...
 2013-11-15 19:06:30 +00:00
Sunstrike 5b463f2d9c Update build.xml 
Change name of Deobf jars (fix yer grammar! Also cleaner.) - More work to come (cleaning up whitespace mostly)
 2013-11-15 12:56:10 +00:00
Sunstrike 884ed5a200 Update build file to pull in Mantle submodule for builds 2013-11-09 14:59:13 +00:00
Sunstrike 3a4d0f84a1 Import Mantle as a submodule 2013-11-09 14:50:48 +00:00
Sunstrike e133c11aea Add Bukkit to EnvChecks. 2013-11-09 13:36:44 +00:00
Sunstrike 22ab7a12d8 Merge pull request #290 from Glassmaker/Patch-2 
Build Clean up
 2013-11-02 02:46:13 -07:00
Sunstrike 967e7210d6 Amend environment checks 2013-10-31 19:52:11 +00:00
Sunstrike 6028ea74cb Add Optifine to unsupported mod checks. 
Also moves the GT log note to Env Checks.
 2013-10-30 22:15:03 +00:00
Sunstrike fe76c424bf Delete aksnc 
What even -was- that?
 2013-10-28 22:39:30 +00:00
Sunstrike 816c86e4d5 Merge pull request #283 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2013-10-28 12:24:55 -07:00
Sunstrike feb3c55393 Partially plug lava leak in Smeltery. 
Seared Tanks - A bit leaky, no? Just kidding - It was the logic in SmelteryComponent leaking.
 2013-10-28 19:20:42 +00:00
Sunstrike 807c91d317 Fix wooden rail localisation + add recipe 2013-10-28 18:50:01 +00:00
Sunstrike 86f436a2c8 Fix NEI URL in build.xml 2013-10-28 17:38:25 +00:00
Sunstrike f64d461ff0 Fucking build file... 
Atleast check your Ant stuff is valid for the love of the build server...
 2013-10-28 17:27:08 +00:00
Sunstrike 74c3752ba7 Fix build file. 
NEI integration?! Why the hell is that even here?! Also, TEST the ant file before committing new changes to it
 2013-10-28 17:18:08 +00:00
Sunstrike e671efc362 Merge pull request #281 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2013-10-28 08:09:51 -07:00
Sunstrike e52da9b27c Merge pull request #278 from Samtrion/master 
BuildCraft Compat + mcmod.info update
 2013-10-26 09:55:46 -07:00
Sunstrike 50f115e42c Merge pull request #277 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2013-10-26 07:41:46 -07:00
Sunstrike a4568dccd2 Merge pull request #276 from Vexatos/patch-2 
Update de_DE.lang
 2013-10-26 06:41:55 -07:00
Sunstrike 1c79f117e2 Merge pull request #273 from iguanaman/master 
Make getHarvestLevelName protected for overriding.
 2013-10-26 02:22:09 -07:00
Sunstrike daec0eacfa Pull in wooden rails from Chaotic Bastion. 2013-10-24 18:59:04 +01:00
Sunstrike d80b0c7c31 Cleanup aftermath of previous drunkcode session in AE plugin. 2013-10-24 16:16:31 +01:00
Sunstrike 579764c621 Add TConstruct Environment to valid crash reports as well 2013-10-24 12:27:50 +01:00
Sunstrike dcfcc3e7c5 Squirrel away env checks to new helper 2013-10-22 20:09:21 +01:00
Sunstrike 9a6abc31f6 Fix for blathering idiots reporting GT-related crashes. 
We now correctly add an entry to crash reports during enhancement if unsupported mod(s) are located.
 2013-10-22 16:49:14 +01:00
Sunstrike 51fbf822b8 Slime islands now shouldn't collide with terrain. 
(Unless that terrain is stupidly steep or sudden)
 2013-10-20 10:39:46 +01:00
Sunstrike 9aa7c033b0 Merge branch 'master' of https://github.com/SlimeKnights/TinkersConstruct 2013-10-19 20:40:33 +01:00
Sunstrike 2450c177f2 Apply Vazkii's fix for a certain GUI mod. 2013-10-19 20:40:00 +01:00
Sunstrike 1d24653c4a Merge pull request #257 from TheVikingWarrior/patch-2 
Update it_IT.lang
 2013-10-19 09:44:56 -07:00
Sunstrike d10c93f1a3 Merge pull request #258 from Vexatos/patch-2 
Update de_DE.lang
 2013-10-19 09:44:40 -07:00
Sunstrike 6f6932989e Update mcmod.info to reflect new repo 2013-10-19 14:07:28 +01:00
Sunstrike 1fadcfbf59 Blacklist Plugins from Preloader. 2013-10-19 10:55:11 +01:00
Sunstrike fa94af0c54 Fix derp in readNetworkNBT for layer scan 2013-10-18 21:05:59 +01:00