Commit Graph
2948 Commits
Author SHA1 Message Date
tterrag1098 05ab60db97 Add syncing to other clients for toggleable DS upgrades 2015-05-07 10:43:33 -04:00
tterrag1098 66de4cf20d Refactor DS upgrade classes, add system for upgrade rendering 2015-05-06 17:00:22 -04: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
tterrag1098 d44a6eb00b Merge pull request #2421 from HenryLoenwind/magnetConfig
More Config for Magnet
2015-05-05 13:09:43 -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
tterrag1098 5fc060358d Merge pull request #2401 from HenryLoenwind/waterSpawner
Spawn water creatures in liquid
2015-04-29 19:47:42 -04:00
HenryLoenwind e54749e55f Spawn water creatures in liquid 2015-04-30 01:26:53 +02:00
HenryLoenwind 767fe8de91 Use client tick in render animation 2015-04-30 01:00:41 +02:00
Henry Loenwind ebec0bee6c Even more Baubles
* Baubles slots are now displayed in the Capacitor Bank. So the Magnet can be charged directly.
2015-04-30 00:21:25 +02:00
tterrag1098 7ee5673b0f Merge pull request #2398 from MatthiasMann/issue_2345
#2345 remember the random chance value when the recipe couldn't be started
2015-04-29 17:23:04 -04:00
tterrag1098 129b705cae Merge pull request #2396 from MatthiasMann/recipe_sorter
#2372 register with RecipeSorter
2015-04-29 17:22:03 -04:00
tterrag1098 54af4e99f3 Merge pull request #2397 from MatthiasMann/lights2
allow WirelessChargedLocation to be created while the TileEntity is not ...
2015-04-29 17:21:58 -04:00
tterrag1098 0cc68ee4ac Merge pull request #2301 from Lilylicious/travelanchor
Elevator functionality and sneak activation
2015-04-29 17:21:02 -04:00
Dwargkiller c3f31ec2f4 Travel Anchor Elevators 2015-04-29 22:26:57 +02:00
Matthias Mann e9f676e7a8 #2345 remember the random chance value when the recipe couldn't be started 2015-04-29 21:26:05 +02:00
Matthias Mann fad6475dfa allow WirelessChargedLocation to be created while the TileEntity is not yet in the world 2015-04-29 21:06:38 +02:00
Matthias Mann 778e33bf3d #2372 register with RecipeSorter 2015-04-29 20:57:42 +02:00
tterrag1098 a12fbd184d Merge pull request #2393 from MatthiasMann/issue_2392
#2392 don't crash on missing NBT data
2015-04-29 01:51:01 -04:00
Matthias Mann d94ee82ac6 #2392 don't crash on missing NBT data 2015-04-29 07:41:15 +02:00
tterrag1098 2c35b44baa Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
Conflicts:
	src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java
2015-04-28 20:13:05 -04:00
tterrag1098 a5290472ec Add new telepad block textures 2015-04-28 20:12:15 -04:00
tterrag1098 b86cf9e706 Merge pull request #2382 from MatthiasMann/lights
optimize and cleanup lights
2015-04-28 16:52:54 -04:00
Matthias Mann b44ac34905 optimize and cleanup lights 2015-04-28 22:51:00 +02:00
tterrag1098 8452a8ca96 Merge pull request #2329 from HenryLoenwind/torcherino
New: Config value to disable upticking
2015-04-28 15:44:49 -04:00
tterrag1098 54ca546f1d Merge pull request #2282 from Adaptivity/master
SAG Mill support for Tcon, Nether Ores
2015-04-28 15:44:08 -04:00
tterrag1098 bfa86203aa Merge pull request #2338 from HenryLoenwind/cleanup
Cleanup: null checks in doUpdate()
2015-04-28 15:43:05 -04:00
tterrag1098 e8e3106ee9 Merge pull request #2334 from HenryLoenwind/fix2
Clamp meta in glass renderer
2015-04-28 15:39:05 -04:00
tterrag1098 0af8f791f8 Merge pull request #2368 from MatthiasMann/remove_redundant_code
remove redundant code - SlotSmelter.isItemValid already returns false
2015-04-28 15:38:10 -04:00
tterrag1098 3b9d2bf6ff Merge pull request #2380 from HenryLoenwind/fix3
Fix: TeleportEntityEvent fired twice
2015-04-28 15:30:42 -04:00
tterrag1098 966b156064 Merge pull request #2383 from HenryLoenwind/fix4
Fix: KillerJoe Sword z-Fighting
2015-04-28 15:29:27 -04:00
HenryLoenwind 43b5249dbc Fix: KillerJoe Sword z-Fighting
* Moved sword a little bit to remove z-fighting with blocks in front of
the KillerJoe.
* Changed inward sword swing to use different (otherwiese unused) value
than forward swing. Doesn't make a big difference either way, but I
think it looks a little bit better this way. More like swinging in a
tiny arc instead of a line.
2015-04-27 21:43:51 +02:00
Henry Loenwind bd5c3fc1ad Fix: TeleportEntityEvent fired twice 2015-04-27 14:36:05 +02:00
tterrag1098 9f4502850b Fix formatter not putting a space after 'if' 2015-04-27 05:58:05 -04:00
tterrag1098 d4360e2b59 #2376 Fix yeta wrench not able to shift+rc remove rotatable blocks 2015-04-26 22:54:15 -04:00
Matthias Mann 45de928868 remove redundant code - SlotSmelter.isItemValid already returns false 2015-04-25 23:20:07 +02:00
tterrag1098 91c51f340b Merge pull request #2349 from MatthiasMann/invpanel_sorting
sort equal stack size by name
2015-04-23 16:13:58 -04:00
Anton ac63a166de Fixed AE2 recipes, fixed formatting. Closes #2356 2015-04-23 19:07:56 +03:00
tterrag1098 7a001e93a6 #2351 Forge bug - FakePlayer does not override sendChatMessage 2015-04-22 18:26:53 -04:00
Matthias Mann c077f04849 sort equal stack size by name 2015-04-22 01:50:39 +02:00
tterrag1098 5cbacb0e7b Fix remaining issues with text fields (again), add right click clearing 2015-04-20 18:51:24 -04:00
HenryLoenwind 039029cf16 Clamp meta in glass renderer
* Don't crash on invalid block meta value
* Reworked code to avoid call to enum.values()
* re #2333
2015-04-20 22:45:40 +02:00