Commit Graph
1699 Commits
Author SHA1 Message Date
tterrag1098 0dee1ee434 Porting more code over, switch to new IWidgetIcon system 2015-05-01 15:59:42 -04:00
tterrag1098 3f93ab2bde Merge remote-tracking branch 'origin/master' into endercore 2015-05-01 13:04:31 -04:00
tterrag1098 b58e0432dc Merge pull request #2389 from HenryLoenwind/baubles4capbank
Even more Baubles
2015-05-01 13:03:32 -04:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04:00
tterrag1098 badc9cbae6 Merge pull request #2400 from HenryLoenwind/fix5
Use client tick in render animation
2015-04-29 19:47:47 -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
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 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 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
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
HenryLoenwind 93ba2428a2 New: Config value to disable upticking
* Config value to have machines reject an update rate that is higher
than the global tick rate.
* Default is unchanged (allow).
2015-04-20 22:11:29 +02:00
Matthias Mann 3df2ddeb3a fix slot ranges and shift clicking 2015-04-20 19:47:47 +02:00
Matthias Mann 4975c3365a increase item extraction cost 2015-04-20 19:47:04 +02:00
tterrag1098 c1b7be5820 Remove invpanel sysouts, clean up all invpanel code 2015-04-20 01:13:54 -04:00
tterrag1098 cf46c0cf93 Reverse invpanel scroll behavior and remove a sysout 2015-04-20 01:02:59 -04:00
tterrag1098 ef26336fca Merge branch 'inventory_panel2' 2015-04-19 23:50:26 -04:00
tterrag1098 720cb6f971 Improve scroll widget thumb icon behavior when dragging 2015-04-19 23:48:04 -04:00
tterrag1098 a000b153b8 Fix not being able to type 'e' in text fields (again) 2015-04-19 23:29:13 -04:00
tterrag1098 26ea2388e1 Merge pull request #2340 from MatthiasMann/inventory_panel2
The Inventory Panel
2015-04-19 23:28:07 -04:00
Matthias Mann 3637f7cd18 Java 6 compatibility 2015-04-20 05:05:43 +02:00
Matthias Mann df641b87d7 added recipes, first part of new textures 2015-04-20 05:05:43 +02:00
Matthias Mann 17a7be0a63 allow right clicking on sort button 2015-04-20 05:05:43 +02:00
Matthias Mann d17e59eb06 now the inventory panel requires nutrient distillation to work 2015-04-20 05:05:43 +02:00
Matthias Mann eb62256e86 move ownership of inventory database to item conduit network to allow it to be shared between multiple panels 2015-04-20 05:05:43 +02:00