upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,441 Commits 6 Branches 324 Tags
c6e24f851146f4eff01ddd7e2c6e75d84dfb0622
Commit Graph
68 Commits
Author SHA1 Message Date
Bernhard Bonigl c6e24f8511 Fix Traveller Gear Repair #1093 2014-10-18 17:16:50 +02:00
Bernhard Bonigl 03755be47d Fix Armor-Moss-Modifier not updating display, so people stop complaining about it not working. 2014-10-05 12:18:21 +02:00
Bernhard Bonigl 1cd4f214ff Make modifiers only applicable to their valid types. Fix some inconsistencies with that. Might possibly contain bugs still. 2014-09-24 00:47:06 +02:00
Bernhard Bonigl 25261243b0 Change the damage display stuff to use NBT instead of the internal damage stuff, so we can make setItemDamage compatible with the NBT durability we use. 2014-09-20 14:09:59 +02:00
Arthur Uzulin 80efde613a The return of achievements 
- Re-added achievements
- Organised all imports (seemed all over the place)
- Formatted all code (seemed very combined, used the TinkerStyle)
 2014-09-09 18:30:15 +10:00
Zach fbf7720a05 remove println 
Cherry-picked from 3f10d07849d3324a87a297fcc7bed5b63ac00e20
 2014-08-28 01:28:03 -07:00
mDiyo 5b56d5e392 Buff redstone mod, refactor broad tools to match 
Cherry-picked from 34a4c8c80f969cafd696b41d963c2a041347d4cd

Conflicts:
	src/main/java/tconstruct/common/TProxyCommon.java
	src/main/java/tconstruct/items/tools/Excavator.java
	src/main/java/tconstruct/items/tools/Hammer.java
	src/main/java/tconstruct/items/tools/LumberAxe.java
	src/main/java/tconstruct/library/tools/HarvestTool.java
	src/main/java/tconstruct/modifiers/tools/ModLapis.java
	src/main/java/tconstruct/modifiers/tools/ModRedstone.java
	src/main/java/tconstruct/tools/gui/ToolStationGui.java
 2014-08-28 01:27:39 -07:00
Bernhard Bonigl 8959a70387 Fix some armor modifiers being applicable to everything, crashing the game. #885 2014-08-21 21:42:44 +02:00
Bernhard Bonigl 1e4afd6922 Try to obtain Flux-Transfer-Rates on fully charged/completely empty batteries to prevent distorted results. 2014-08-16 16:44:54 +02:00
Bernhard Bonigl 02de82951d Allow upgrading the Flux-Modifier, if the new battery is bigger 2014-08-08 12:58:29 +02:00
Bernhard Bonigl 820b13e106 Flux modifier now uses the properties of the battery that was added. (Max-Energy and transfer rates) 2014-08-08 11:13:48 +02:00
61352151511 223098bd0c Remove Unused Imports 2014-08-04 19:29:38 -03:00
Bernhard Bonigl 527934d277 Bugfix: It was possible to add more than <maxamount> to redstone/lapis/... modifiers if they were exactly at a lvlup threshold 2014-07-30 13:31:13 +02:00
Bernhard Bonigl f6877b55cb Bugfix: Blaze modifier didn't stack its levels properly. Broke after 1st level because it only checked for it's first maximum. 2014-07-30 12:54:16 +02:00
mDiyo 1affd6d909 Merge pull request #724 from squeek502/1.7.10-merge-1.6.4 
Merge some unmerged pull requests from 1.6.4 branch
 2014-07-12 10:01:35 -08:00
mDiyo ac50689102 Multibugfix 2014-07-06 22:59:44 -08:00
squeek 443757c28c Fixed multiple repairs being more effective than a single repair with the same amount of materials 
Fixes SlimeKnights/TinkersConstruct#584
 2014-07-06 23:57:54 -07:00
squeek 4fce1a924e Fixed repairing only working with the first 2 crafting slots (it will now work with any slot). 
Fixes SlimeKnights/TinkersConstruct/#568
 2014-07-06 23:57:52 -07:00
mDiyo c13c8f8050 Fix armor rendering, start armor abilities 2014-07-02 23:37:28 -08:00
mDiyo c525493545 Update modifiers, start travellers gear 2014-06-30 22:26:00 -08:00
mDiyo e2f0558b6f Reorganize folders for modules 2014-06-04 21:44:48 -08:00
Progwml6 222bcc894e clean up some issues with missed quotes in PR 2014-04-17 01:03:24 -04:00
TheVikingWarrior 4b40a08d2e Update ModSmite.java 2014-04-16 17:10:35 +02:00
TheVikingWarrior 8b296e06ba Update ModReinforced.java 2014-04-16 16:54:47 +02:00
TheVikingWarrior cc414faf1d Update ModRedstone.java 2014-04-16 16:12:10 +02:00
TheVikingWarrior e9d602aa4d Update ModRedstone.java 2014-04-16 16:09:06 +02:00
TheVikingWarrior cd2599d816 Update ModPiston.java 2014-04-16 15:59:53 +02:00
TheVikingWarrior 7aa23ac405 Update ModBlaze.java 2014-04-16 15:55:41 +02:00
TheVikingWarrior 770af463ef Update ModLapis.java 2014-04-16 15:55:24 +02:00
TheVikingWarrior d2011475fb Update ModFlux.java 2014-04-16 15:49:41 +02:00
TheVikingWarrior a14f47ebe0 Update ModButtertouch.java 2014-04-16 15:47:22 +02:00
TheVikingWarrior e3bc06e5fa Update ModBlaze.java 2014-04-16 15:44:24 +02:00
TheVikingWarrior 04a854ac34 Update ModBlaze.java 2014-04-16 15:15:51 +02:00
TheVikingWarrior 01fe4b708c Update ModAttack.java 2014-04-16 15:13:59 +02:00
TheVikingWarrior a1bf308a6e Update ModAntiSpider.java 2014-04-16 15:11:24 +02:00
TheVikingWarrior a1bdf9f172 Update AModDoubleJump.java 2014-04-15 22:16:47 +02:00
Alexander a1b8d62dcb Change back the RenderUpdate 2014-04-06 12:45:14 -04:00
Alexander 42a5af5566 Fix some bugs,and add diyos BattleSigns 2014-04-02 20:38:48 -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
Alexander 69c8fd81e1 Fix some NBT errors 2014-02-17 15:09:49 -05:00
Alexander 3d866316a7 Doing some code cleanup. 2014-02-17 00:31:43 -05:00
Alexander 5d4e38c0cb Upload my Code Changes/Format/imports 2014-02-16 14:23:50 -05:00
Alexander 56d348dcc7 Enable Capes/Format Code 2014-02-11 21:35:05 -05:00
Progwml6 86f8a2003f pull in some armor stuff from 1.6 2014-02-08 13:30:19 -05:00
Alexander 2a2f84ee88 Format code again + organize imports 2014-02-05 10:28:54 -05:00
Progwml6 ffaea7d4b7 run repo through formatter 2014-02-05 09:11:06 -05:00
Progwml6 b8cf7cdc5e run through remap script 2014-02-05 08:28:53 -05:00
Progwml6 9fce66a827 port in some fixes from 1.6.x 2014-02-04 20:40:58 -05:00
Alexander b70ed14631 Fix some bugs :). 2014-02-02 22:36:22 -05:00
Progwml6 ee7bc7d7eb around 300 combined errors 2014-02-01 14:55:52 -05:00