Commit Graph
1745 Commits
Author SHA1 Message Date
tterrag1098 4a82b3c747 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-21 13:44:52 -04:00
tterrag1098 0e852e4a94 Fix vat particles to fit new model 2015-05-21 13:44:39 -04:00
CrazyPants dd2fb28b60 Merge pull request #2484 from MatthiasMann/invpanel_keep_lists_in_sync
also clear requestedItems when clientItems is cleared
2015-05-21 22:32:54 +08:00
CrazyPants 8deff082af Merge pull request #2483 from MatthiasMann/itemconduit_shiftclick_upgrades
allow shift clicking item conduit upgrades (filters, speed, etc)
2015-05-21 22:31:34 +08:00
CrazyPants 8af8274155 Merge pull request #2482 from MatthiasMann/dark_glass
#2479 Dark Glass
2015-05-21 22:28:56 +08:00
tterrag1098 13122027a6 Use getters for collision/selection on inv panel to stop getting stuck 2015-05-20 16:23:01 -04:00
tterrag1098 789fa1f345 Centralize config sync packet, sync telepad lock configs 2015-05-18 20:57:36 -04:00
tterrag1098 a9c73b70d4 Improve telepad power usage curve and add configs for values 2015-05-18 20:45:16 -04:00
tterrag1098 6215e39410 Fix machine active state blinking in between successive tasks 2015-05-18 15:16:05 -04:00
Matthias Mann ea29bc87ba also clear requestedItems when clientItems is cleared 2015-05-18 09:02:39 +02:00
Matthias Mann 976c969861 allow shift clicking item conduit upgrades (filters, speed, etc) 2015-05-17 21:39:14 +02:00
Matthias Mann 018d9b63d9 #2479 Dark Glass 2015-05-17 08:47:09 +02:00
Matthias Mann f607a06656 remember filter and sort mode, show item count in tooltip for large stacks, fix NEI overlapping with GUI 2015-05-16 11:56:30 +02:00
Matthias Mann 2dd9090220 allow placing the inventory panels on all sides 2015-05-16 09:05:57 +02:00
tterrag1098 26cbc4edee Fix adding gas conduit recipe even when it is disabled 2015-05-15 12:00:33 -04:00
tterrag1098 a70b4805d0 Fix not calling AbstractItemConduit.init() corrupting the item's state 2015-05-15 11:55:57 -04:00
tterrag1098 b9bfbb64c8 Fix gas conduit item not disabling, fix loading NBT of disabled conduits 2015-05-15 11:54:34 -04:00
tterrag1098 efb13d1923 Fix telepad rendering with breaking animation 2015-05-13 14:34:31 -04:00
tterrag1098 72bf5832e0 Add tooltip to telepad, add coord selector recipe 2015-05-13 14:05:34 -04:00
tterrag1098 ed8845db87 Use .chatString() when displaying block coords in item conduit printout 2015-05-10 23:27:40 -04:00
tterrag1098 1735fb59c8 #2453 Fix compat with newer forge versions in reservoir 2015-05-10 04:05:19 -04:00
tterrag1098 4eff12dca7 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-09 19:06:27 -04:00
tterrag1098 cfcc8a6435 Clean up double chest meta logic 2015-05-09 19:06:17 -04:00
tterrag1098 ecfc0ca7fb Merge pull request #2455 from MatthiasMann/issue_2441
#2441 Use the correct variable names for the slots
2015-05-09 18:55:53 -04:00
downslope7 6ac625e62d Fix config typos, closes #2447 2015-05-09 17:53:40 -05:00
tterrag1098 37770cb6f8 #2339 Fix being able to improperly rotate double chests 2015-05-09 18:48:11 -04:00
tterrag1098 e6c58db6fc Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-09 18:20:40 -04:00
tterrag1098 b1cd97eef5 #2355 Disallow non-opaque blocks from being used for painted glowstone 2015-05-09 18:20:30 -04:00
Matthias Mann e55d6d1d8b #2441 Use the correct variable names for the slots 2015-05-10 00:01:00 +02:00
Matthias Mann 63d7aa24ae allow storing the current crafting recipe for the crafting helper 2015-05-09 09:19:39 +02:00
RAnders00 b0783a2291 Fix typos in configuration file. Fixes #2440
I was not able to find the "level" misspells, sorry. It looks like the issue creator had a outdated configuration file, I just looked over a freshly generated file and could not locate any "level" misspells.
2015-05-08 21:49:31 +02:00
tterrag1098 b5d0b8df0d More tweaks to render translations, add particle effects for jump boost 2015-05-07 20:07:30 -04:00
tterrag1098 1aaf113910 Fix crash on dedicated server 2015-05-07 18:02:15 -04:00
tterrag1098 5c08d92b40 Fix renders being incorrectly offset while sneaking 2015-05-07 17:15:01 -04:00
tterrag1098 e1f7dfe9f1 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2015-05-07 10:43:44 -04:00
tterrag1098 05ab60db97 Add syncing to other clients for toggleable DS upgrades 2015-05-07 10:43:33 -04:00
tterrag1098 959022cde0 Merge pull request #2425 from HenryLoenwind/tankCleanup
Refactored Tank Classes
2015-05-06 21:53:09 -04:00
tterrag1098 66de4cf20d Refactor DS upgrade classes, add system for upgrade rendering 2015-05-06 17:00:22 -04:00
Henry Loenwind 8ecc703cdb Refactored Tank Classes 2015-05-05 21:20:19 +02:00
tterrag1098 23a8a8b312 Merge pull request #2408 from MatthiasMann/issue_2407
#2407 allow more localization
2015-05-05 13:12:09 -04:00
tterrag1098 2b280e26c2 Merge pull request #2411 from HenryLoenwind/shiftClick
Fix: Shift-Click handling
2015-05-05 13:11:39 -04:00
Henry Loenwind a1fcc934b4 More Config for Magnet
* Config values re #2387 (defaults unchanged)
* Fix to @Optional.Method annotation might help with #2414 #2246
2015-05-04 17:56:13 +02:00
tterrag1098 d54765d439 Add required AE2 version to @Mod dependencies
Conflicts:
	src/main/java/crazypants/enderio/EnderIO.java
2015-05-03 17:03:19 -04:00
tterrag1098 97c8bea199 Fix being able to pull out the last 2 buckets of a reservoir 2015-05-03 16:44:12 -04:00
tterrag1098 cdb5d842f7 Merge pull request #2314 from HenryLoenwind/fix
Fix: Bucket Handling
2015-05-03 16:32:32 -04:00
tterrag1098 e5ca6d2485 #2416 Fix ClientProxy checking config settings in static init 2015-05-03 00:34:37 -04:00
HenryLoenwind 912667c4d4 Fix: Shift-Click handling
* Fixes mixup of TE slots and GUI slots
* Fixes off-by-one erro with hotbar
* re #2410
2015-05-02 01:00:58 +02:00
tterrag1098 b58e0432dc Merge pull request #2389 from HenryLoenwind/baubles4capbank
Even more Baubles
2015-05-01 13:03:32 -04:00
Matthias Mann 1d8882eee3 #2407 allow more localization 2015-05-01 09:23:22 +02:00
tterrag1098 badc9cbae6 Merge pull request #2400 from HenryLoenwind/fix5
Use client tick in render animation
2015-04-29 19:47:47 -04:00