Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-23 15:48:34 +01:00
Code Issues Projects Releases Wiki Activity
1715 commits 14 branches 4 tags 33 MiB
Commit graph

1538 commits

Author SHA1 Message Date
Ellpeck
4e0082ed7d Remove all uses of @Nonnull because it's stupid anyways. 
ACTUALLY closes #97.
 2016-05-29 23:49:35 +02:00
Ellpeck
79660f3f6f Made hasCapability not call getCapability. 
Supposedly closes #97
 2016-05-29 23:39:50 +02:00
Ellpeck
af67fb87cc Added view online button to booklet 2016-05-29 22:11:18 +02:00
Ellpeck
da0f071d58 Death tracking part 1 2016-05-27 18:54:17 +02:00
Ellpeck
f2ee1b9414 Made booklet words and characters not be more than they should be because everything was being done twice 2016-05-26 23:05:08 +02:00
Ellpeck
9e50818fca Remove formatting codes of the text output 2016-05-26 22:53:11 +02:00
Ellpeck
16d9b95b5a Added a config option to print all of the booklet text to file on startup. 
For debug purposes.
And because it's cool.
 2016-05-26 22:49:47 +02:00
Ellpeck
c6b0ea9f98 Booklet stand model + bounding box 2016-05-26 14:59:48 +02:00
Ellpeck
796944d2ab Re-added booklet stand. 
Model and better bounding box to come.
 2016-05-26 13:11:43 +02:00
Ellpeck
b4a64c1270 Fixed a massive bug with tiles not syncing properly when re-entering unloaded chunks >_> 2016-05-26 13:10:14 +02:00
Ellpeck
d3150672f4 y u no foreach 2016-05-24 18:31:09 +02:00
Ellpeck
b746ec5d03 Lush caves doc 2016-05-21 15:49:50 +02:00
Ellpeck
068f367fa5 Changed world data file name, might break stuff though 2016-05-21 15:34:36 +02:00
Ellpeck
b826c83c50 "Added lush caves that spawn randomly" or something like that. 
I guess I'll leave these in, as they're kind of awesome.
 2016-05-21 12:46:55 +02:00
Ellpeck
9b9f7b8ff3 Scrap this project. 
It doesn't fit the theme, it doesn't work like it should, it's broken to no end.
Yea, I'll probably do it some other time. Maybe.
 2016-05-21 12:21:36 +02:00
Ellpeck
2ff5f2758e Added lush caves to the cave world 2016-05-21 00:39:50 +02:00
Ellpeck
3f0b9beb5c Added custom cave gen for the cave worlds. 
No idea what it actually does right now though.
 2016-05-20 22:13:36 +02:00
Ellpeck
4b425a36ab SUPPRESS ALL THE THINGS!! 2016-05-20 19:05:10 +02:00
Ellpeck
b71af53d13 Reworked compost to accept custom recipes 2016-05-20 17:55:33 +02:00
Ellpeck
93b51eb853 Removed value that was turned to true when having generated the spawn cave as it would've been overriden on world join anyway. As there's only one spawn, unless you set it into chunks that haven't generated yet, it doesn't matter anyways. 2016-05-20 14:50:39 +02:00
Ellpeck
69013d3583 r34! 2016-05-19 20:52:17 +02:00
Ellpeck
b00e214217 1.9.4! 
Go suck a dick now.
 2016-05-19 20:05:13 +02:00
Ellpeck
cddb514382 Turned cave mode off for now. 
Working on it some more at some other point.
 2016-05-19 16:06:27 +02:00
Ellpeck
5cef7badac Removed Firework Box Minecart. 
Aaw :(
 2016-05-19 16:03:37 +02:00
Ellpeck
8b433056d2 Made impure iron convert in water and in the crusher 2016-05-18 21:14:11 +02:00
Ellpeck
05f159f48a Made blocks in the cave world be determined by seed, added impure iron ore that spawns in cave world 2016-05-18 19:34:57 +02:00
Ellpeck
aec4bfbaa4 Change this name 2016-05-17 22:30:05 +02:00
Ellpeck
22b0a9a64e Changed cave world spawning a bit, made the world generate with cobble and glowstone in the walls 2016-05-17 22:26:26 +02:00
Ellpeck
b5e8cf0345 Start of cave world. 
Whaaaat?
 2016-05-17 15:59:12 +02:00
Ellpeck
fd407d3983 Changed client data and fake player to completely lower case 2016-05-17 11:34:50 +02:00
Ellpeck
a2d360d610 How did I not notice this..? 2016-05-16 22:54:44 +02:00
Ellpeck
6c1f8fec6c Update copyright and cleanup code 2016-05-16 22:52:28 +02:00
Ellpeck
a21981bf01 Minecart Rarity 2016-05-16 21:54:22 +02:00
Ellpeck
7aa813f04e Made special drops dependent on the looting level you have 2016-05-16 21:10:35 +02:00
Ellpeck
0454fc521b Made drop chances for wings, solid xp and cobweb more common 
Closes #94
 2016-05-16 17:56:17 +02:00
Ellpeck
e20a82a4ad Firework Box Minecart! 2016-05-16 17:00:29 +02:00
Ellpeck
028accdf3e Added spawner changer to creative tab 2016-05-16 01:04:11 +02:00
Ellpeck
e693486544 Removed calls of addRenderVariant, because apparently it didn't change anything 2016-05-15 12:21:28 +02:00
Ellpeck
96c9e1895c Actually call it 2016-05-15 12:01:26 +02:00
Ellpeck
3403947af0 Moved lenses to API side 
Bump API version to 13
 2016-05-15 12:00:42 +02:00
Ellpeck
09ecb708aa Moved inner tileentity classes to own file 2016-05-14 17:50:10 +02:00
Ellpeck
f34ed513fa r33! 2016-05-14 15:54:57 +02:00
Ellpeck
67147df4cb Put dots in front of the booklet entry buttons on the front page 2016-05-14 15:07:10 +02:00
Ellpeck
5db240b6ad Little tiny change 2016-05-14 14:21:59 +02:00
Ellpeck
64966ad66e Added the possibility for different types of lenses to be conversion lenses 2016-05-14 14:14:06 +02:00
Ellpeck
e0cf180358 Lotsa API restructuring 2016-05-14 13:51:18 +02:00
Ellpeck
1df694c8e9 Added smart whitelist button to the whitelist laser relay that automatically adds items from adjacent chests to the whitelist 2016-05-14 13:13:35 +02:00
Ellpeck
1f2f0e7cbf Remove native invtweaks integration because it was done in a really weird way O_o 2016-05-14 11:15:27 +02:00
Ellpeck
1cdae3be7b Banner shields 2016-05-14 02:26:34 +02:00
Ellpeck
30d493d513 Add custom banner patterns 2016-05-13 23:19:30 +02:00
Ellpeck
796fc2de43 What was this here for..? 2016-05-13 22:08:53 +02:00
Ellpeck
3495901d37 Grab the broom and sweep! 2016-05-13 21:57:53 +02:00
Ellpeck
549402d98e The laser relay has less particles again now. 
As it was lagging games.
 2016-05-13 17:05:47 +02:00
Ellpeck
41027a07c2 Fixed a massive console spam issue of Whitelisted Item Laser Relays trying to sync client->client 2016-05-13 16:58:16 +02:00
Ellpeck
dcd41a016a Make tile entity updating not send null packets causing console spam 2016-05-12 19:37:31 +02:00
Ellpeck
3ad6b1c7cb Made Item Laser relays that have a whitelist have more priority than those who don't 2016-05-12 19:00:42 +02:00
Ellpeck
8e93abf05a Made Placers be able to place anything again. 
Yes. Really.
 2016-05-12 18:48:13 +02:00
Ellpeck
43c93f2e51 How didn't it bug me that this wasn't centered? 2016-05-12 14:28:22 +02:00
Ellpeck
95d2e226e3 So this isn't needed anymore 2016-05-12 14:27:29 +02:00
Ellpeck
bfd859e144 Replace Growth Ring's constant NBT updating with world time checking 2016-05-12 14:26:10 +02:00
Ellpeck
2fe50c71aa Safer check 2016-05-11 21:00:26 +02:00
Ellpeck
58e5af0814 Less processing of whitelist 2016-05-11 20:59:38 +02:00
Ellpeck
a8717e6191 Changed some advanced laser relay functionality 2016-05-11 20:55:29 +02:00
Ellpeck
44ed2dcda1 Made some info on the item system clearer 2016-05-11 20:44:21 +02:00
Ellpeck
6e96964db8 Item viewer texture 2016-05-11 19:39:59 +02:00
Ellpeck
7a0ba8819d Item Storage recipes and doc 2016-05-11 19:30:19 +02:00
Ellpeck
40d02814ea Fixed sounds not working on servers 2016-05-11 15:28:46 +02:00
Ellpeck
54c618231f Made booklet sometimes not type a letter into the search box when pressing C 2016-05-10 22:36:53 +02:00
Ellpeck
c4a94a0724 Merge branch 'patch-7' of https://github.com/Kristian295/ActuallyAdditions 2016-05-10 22:31:22 +02:00
Ellpeck
ea1c65bbb3 Added whitelistable advanced item laser relays 2016-05-10 22:19:15 +02:00
Ellpeck
b75837d6b2 Changed some stuff around in Drill's container to match TileInventoryBase's sorting 2016-05-10 20:49:17 +02:00
Ellpeck
a7a76cc861 Dang it, now it's right 2016-05-10 19:00:35 +02:00
Ellpeck
1c9038d703 Made the smiley cloud not continuously mark dirty 2016-05-10 18:57:26 +02:00
Ellpeck
3b0b6dab54 Made ActAdd Java 6 compatible. 
Yea.
 2016-05-10 18:48:35 +02:00
Ellpeck
f034a14a69 Some cleanup ~ 2016-05-10 18:37:00 +02:00
Ellpeck
b0ecc87a23 Reworked item system a bit to allow for black- and whitelisting 2016-05-09 19:05:20 +02:00
Ellpeck
b4fde39a33 Item Phantom Networks, part 1 2016-05-08 21:09:58 +02:00
Ellpeck
9c40296db0 Spawner Shards + Spawner Changer recipe and doc 2016-05-08 14:11:24 +02:00
Ellpeck
2c6b2dae77 Just in case 2016-05-08 11:07:19 +02:00
Ellpeck
c7f5455862 Spawner Changer 2016-05-08 02:55:59 +02:00
Ellpeck
8e8b59034b This doesn't make any sense 2016-05-07 23:43:14 +02:00
Ellpeck
1f6f3152ed Added max damage display to the advanced tooltip 2016-05-07 23:38:50 +02:00
Ellpeck
19d11e783b Removed unneded parts of the InvTweaks API. 
Why did I have these again..?
 2016-05-07 21:36:41 +02:00
Ellpeck
bddce5fcd6 Fix the fix 2016-05-07 20:24:56 +02:00
Ellpeck
9d1cb8e45a Fixed a bug with fluid placers replacing fluids in front of them 2016-05-07 20:23:50 +02:00
Ellpeck
4b548dd0a9 Re-implemented village structures 
Villager and chest still to go
 2016-05-07 12:55:59 +02:00
Ellpeck
95fa796e92 Cleanup! ~ 2016-05-07 02:49:03 +02:00
Ellpeck
89963a23fb Replaced bucket slots in GUIs with right click functionality 2016-05-06 23:23:29 +02:00
Ellpeck
b8e08d582b Add new buckets to creative 2016-05-06 22:27:38 +02:00
Ellpeck
1695f61a75 Use universal buckets 2016-05-06 22:23:41 +02:00
Ellpeck
f942810592 What did that even mean? 2016-05-06 18:38:56 +02:00
Ellpeck
3e6a18729d Reconstructor module recipe and doc 2016-05-06 16:29:49 +02:00
Ellpeck
f21fa7e317 Added Reconstruction Module as Rarmor integration 2016-05-06 16:11:26 +02:00
Ellpeck
1c0fb786b2 Update JEI and add some new features like seeing the items the recipe works with at the top 2016-05-06 14:50:15 +02:00
Ellpeck
3f4f87f273 Added a method to get the API Version as an integer to the API 2016-05-06 14:19:25 +02:00
Ellpeck
73ebec3930 Gave color changing more freedom. 
Bump API version to 10
 2016-05-06 12:26:41 +02:00
Ellpeck
d842367252 all teh moneyz 2016-05-06 10:55:51 +02:00
Ellpeck
7afa319b5c Changed storage crate recipe. 
Closes #92.
 2016-05-05 20:52:32 +02:00
Ellpeck
06ede0c822 Made color lens more modular by adding a way to colorize items to the API. 
API Version bumped to 9.
 2016-05-05 19:50:59 +02:00
Ellpeck
727fb1fc24 Remove sout 2016-05-05 17:51:36 +02:00
Ellpeck
9d04c236c7 Made the Phantom Redstoneface not update twice when binding to an already active redstone 2016-05-05 17:50:18 +02:00
Ellpeck
6a0d4ca611 Redstoneface recipe and doc 2016-05-05 17:37:12 +02:00
Ellpeck
b6a02d8189 Added Phantom Redstoneface 2016-05-05 17:29:39 +02:00
Ellpeck
9a8d38f5da I don't know why this was even here 2016-05-05 16:58:05 +02:00
Ellpeck
11bc13aefd Added InvWrapper Capabilities to inventories 2016-05-05 13:43:57 +02:00
Ellpeck
b3729703b7 Made directional breaker need energy in pulse mode. 
Duh.
 2016-05-05 13:22:58 +02:00
Ellpeck
5f3e8fc748 Added a default extra whitelist config option for the Item Repairer 
Closes #85
 2016-05-05 10:01:15 +02:00
Ellpeck
74c16757f8 Some fixes 2016-05-05 00:06:02 +02:00
Ellpeck
5b9f668d14 Made double furnace and double crusher use the double amount of energy if both items are smelting 2016-05-04 22:40:58 +02:00
Ellpeck
eb8b6cd06c Merge remote-tracking branch 'origin/master' 2016-05-04 17:48:05 +02:00
Ellpeck
ca91ef4d24 Added the ender star which is a new crafting ingredient 2016-05-04 17:47:54 +02:00
Ellpeck
78bfbc6208 Rename itemCrystalLightBLue.json to itemCrystalLightBlue.json 2016-05-04 16:36:43 +02:00
Ellpeck
0b9101398a Rename itemPotionRIng.json to itemPotionRing.json 2016-05-04 16:36:34 +02:00
Ellpeck
a8365724f8 Made harvestdropevents be posted when mining blocks automatically 2016-05-04 13:15:30 +02:00
Ellpeck
4b0ef298da Fixed laser relays making no particles when the less particles setting is on 2016-05-04 12:59:36 +02:00
Ellpeck
2352e3be31 Fixed oredict creating empty entries when searching for names 2016-05-04 12:19:02 +02:00
Ellpeck
f50c9f32c1 fixed mcmod.info being broken 2016-05-03 22:12:16 +02:00
Ellpeck
1aeea1ef6d Unload the fake player when leaving a world so that it doesn't persist and break stuff 2016-05-03 21:32:51 +02:00
Ellpeck
af8356c9ef Fixed Fluid Placer not being able to place 2016-05-03 21:31:54 +02:00
Ellpeck
16c2c22cf7 Finished models 2016-05-03 21:26:02 +02:00
Ellpeck
15c65216cd Some more model work 2016-05-03 18:29:02 +02:00
Ellpeck
6e18866c79 Fixed equipment slot in energizer and enervator being off 2016-05-03 08:45:01 +02:00
Ellpeck
d6bc78fffb Started work on forge block models. 
Could still take a while though.
 2016-05-02 22:16:58 +02:00
Ellpeck
9ab94e5701 this 2016-05-02 17:46:53 +02:00
Ellpeck
928676ea53 cleanup 2016-05-02 17:12:31 +02:00
Ellpeck
1757f38bd1 Fixed most bounding boxes 2016-05-02 17:09:23 +02:00
Ellpeck
5aa63f2822 Made slab placing a bit more proper 2016-05-02 16:56:27 +02:00
Ellpeck
2599715973 Items are now held properly! \o/ 2016-05-02 16:42:04 +02:00
Ellpeck
bfc68919f3 Fixed a couple of bugs with items that need to be held not working 2016-05-02 07:50:13 +02:00
Ellpeck
eed5cbdc92 4 ATTACK DAMAGE WHEN ON FEET 2016-05-01 22:37:27 +02:00
Ellpeck
98299708d5 I checked that 2016-05-01 22:34:40 +02:00
Ellpeck
cb9db8b4f2 Raised the amount of particles from the laser relay as the total amount of allowed particles has been raised by a lot 2016-05-01 22:30:54 +02:00
Ellpeck
a545eaa008 Fixed sounds 2016-05-01 22:26:26 +02:00
Ellpeck
61d7b783b3 Made XP drops from drill dependent on the forge event 2016-05-01 10:33:40 +02:00
Ellpeck
d2a5f3bb17 Made drill be openable again. Closes #89 2016-05-01 10:29:34 +02:00
Ellpeck
5faa779725 fixed blocks dropping twice when broken with the drill 
Closes #88
 2016-04-30 20:14:01 +02:00
Ellpeck
e267d0110d Fixed a bug causing the player to be unable to fill buckets 2016-04-29 19:31:33 +02:00
Ellpeck
3cd7512ed6 r27! 2016-04-20 21:54:59 +02:00
Ellpeck
08ea43e70d Fudge my life, 1.9 2016-04-20 21:39:03 +02:00
Ellpeck
23f8ccc75c Did some more stuff and things 2016-03-19 15:10:20 +01:00
Ellpeck
5d34bce194 Fixed Drill attack damage 2016-03-19 11:42:11 +01:00
Ellpeck
0499fbdf7f Made the game actually run 2016-03-19 11:36:17 +01:00
Ellpeck
1e2732195d 1.9. 
Fuck my face.
 2016-03-18 23:47:22 +01:00
Ellpeck
6d1878deb3 Made the log not die of spamming 2016-03-18 20:39:24 +01:00
Ellpeck
2b12947e2c Changed Fake Player's name 2016-03-18 20:36:41 +01:00
Ellpeck
54c0884b03 Moved recipe getting to recipeUtil 2016-03-18 18:41:37 +01:00
Ellpeck
dc8ad581ad Cleaned up some registry 2016-03-18 18:38:39 +01:00
Ellpeck
9720381540 Okay, okay, okay, it's fine. 
It was a stupid feature.
I understand. So shut up now.
 2016-03-18 18:19:51 +01:00
Ellpeck
56f9402fde Whoever made the items float? 2016-03-18 18:16:25 +01:00
Ellpeck
7a236aa2b3 Cleaned up Laser Relay Connections and WorldData a bit 2016-03-18 16:13:09 +01:00
Ellpeck
9fc5735985 ESD is done 2016-03-18 16:02:27 +01:00
Ellpeck
efdb43bd5a Let's do this differently, so that you can actually close the book at all when the search field is up 2016-03-18 16:00:36 +01:00
Ellpeck
92172c0fdc Close book with inventory key 2016-03-18 15:55:55 +01:00
Ellpeck
1d27f6e52d I don't want this differentiated 2016-03-18 15:48:52 +01:00
Ellpeck
8ba1d23eff Replaced some method calls 2016-03-18 15:42:06 +01:00
Ellpeck
47568e5fbc Fudge the new item system stuff 2016-03-18 15:31:59 +01:00
canitzp
81130ac0b9 Fixed Phantomface Crash Closes #82 2016-03-15 19:28:54 +01:00
Ellpeck
46d9ad9a10 P's edition 2016-03-08 00:05:34 +01:00
canitzp
9afe9b5a8b Rename itemHoeCrystalblue.json to itemHoeCrystalBlue.json 2016-02-20 21:38:28 +01:00
canitzp
c93276835e Blame on Shadowfacts 2016-02-20 21:25:18 +01:00
Ellpeck
33e231d265 Fixed Canitz' mess. 
Cleanup~
 2016-02-20 16:16:41 +01:00
canitzp
d729f55832 New Compost Rendering 2016-02-20 15:23:03 +01:00
canitzp
967d180cca Replaced some Method calls 2016-02-19 19:58:26 +01:00
canitzp
51de083209 Added a Nullcheck 2016-02-18 22:48:53 +01:00
canitzp
f0d7585fd9 Fixed JEI Booklet Page Rendering Closes #71 2016-02-18 22:33:44 +01:00
canitzp
c0d13ef30f Fixed Double Plant Crash Closes #70 2016-02-18 21:58:19 +01:00
canitzp
353431827f Fixed Double Plant Crash Closes#70 2016-02-18 21:55:37 +01:00
canitzp
8be363ba08 Hopefully fixed a Miner Bug 2016-02-18 18:43:35 +01:00
canitzp
57c37cb900 Rewrite the SmileyCloud Renderer 2016-02-17 23:15:56 +01:00
canitzp
0600c56355 Reactivated AtomicReconstructor Lens Renderer 2016-02-17 21:45:19 +01:00
canitzp
1664ce22e3 Reactivated AtomicReconstructor Lens Renderer 2016-02-17 21:45:02 +01:00
canitzp
b9262df154 Fixed the Tool JSONs 2016-02-17 20:32:02 +01:00
canitzp
6819c6b34b Updated to the official RF-Api for 1.8 2016-02-16 21:49:44 +01:00
Ellpeck
c16629b470 Revert 5272d572be 2016-02-10 21:07:48 +01:00
Glenthor
5272d572be -Added Rounded Prism 2016-02-10 21:06:25 +01:00
Ellpeck
ef07e2d725 Revert #72. 
Text is too long for the pages.
 2016-02-09 18:29:48 +01:00
Kristian295
8caecdfd23 de_DE.lang : ll. 572 - 579 
Translated:
- booklet.actuallyadditions.chapter.intro.*
- booklet.actuallyadditions.chapter.craftingIngs.*
 2016-02-09 18:19:11 +01:00
Ellpeck
32c10c5beb Haphazardly revert implementation of new item system for ESD as it completely broke pulling items for sided inventories 2016-02-06 22:07:12 +01:00
Ellpeck
e15c09778e Set ESD incomplete 2016-02-06 21:56:00 +01:00
Ellpeck
d2721e0979 added click areas to JEI for easy recipe access 2016-02-05 11:19:02 +01:00
Ellpeck
d593a05cca bump api version 2016-02-03 23:46:22 +01:00
Ellpeck
2856c01cce Removed Lens registry. 
It wasn't needed.
 2016-02-03 23:43:44 +01:00
Ellpeck
2007732fdc Changed download link to be the redirect so that it changes everywhere when it actually changes 2016-02-03 18:16:24 +01:00
Ellpeck
9c4056ed52 Made the knife not repairable. 
Closes #69 (hehehehe)
 2016-02-02 07:25:26 +01:00
Ellpeck
0d7340474f Update JEI properly damn it 2016-02-01 21:20:05 +01:00
Ellpeck
34dbefc9e6 ESD Compat for new item system 2016-02-01 21:14:17 +01:00
Ellpeck
56489b362a There we go. 
I fixed it.
 2016-02-01 20:39:11 +01:00
Ellpeck
228ecd50bd More cleanup. 
I hope this fixes the fuckery.
God damn it.
 2016-02-01 20:32:49 +01:00
Ellpeck
348dc518c6 The heck!? 2016-02-01 20:31:27 +01:00
Ellpeck
2d476a0b6d What the fuck IntelliJ 2016-02-01 20:30:15 +01:00
Ellpeck
0540313e75 Cleanup ~ 2016-02-01 17:49:55 +01:00
Ellpeck
c92aebfe0a Fixed Compost and Reconstructor syncing with hoppers. 
Closes #59
 2016-02-01 17:43:14 +01:00
Ellpeck
091b6cbfc3 Fix capabilities 2016-02-01 17:40:17 +01:00
Ellpeck
1e3f0dbe45 Revert that. 2016-01-31 10:54:07 +01:00
Ellpeck
4ac5007279 Made handler compatible with old JEI versions. 
Just in case.
 2016-01-31 10:53:27 +01:00
Ellpeck
7586b7cd56 Made the placer be able to apply bonemeal and do some more awesome stuffz 2016-01-31 03:31:39 +01:00
Kristian295
d1924045c0 Translation of ll. 157-186, 429, 430 
yet untranslated lines:
572-773
 2016-01-29 23:53:29 +01:00
Kristian295
e312ce1f74 Matching de_DE.lang with en_US.lang 
yet untranslated lines:
157-186, 429-430, 572-773
 2016-01-29 23:14:03 +01:00
Ellpeck
4630c39a13 Move Fluids to InitFluids 2016-01-29 17:38:31 +01:00
Ellpeck
3f958a0726 I don't even know the person 
But I'm a nice person.
 2016-01-27 18:22:44 +01:00
Ellpeck
3c108e3cc9 Remove debug output 2016-01-25 19:33:54 +01:00
Ellpeck
bb0338dd55 //TODO make this work for the stupid new system 2016-01-25 19:05:01 +01:00
Ellpeck
a2d7193003 Capabilities for Phantomfaces 2016-01-25 13:42:37 +01:00
Ellpeck
235d86ab8c Semi-implemented new item system I guess? 2016-01-25 13:34:55 +01:00
Ellpeck
7a6fda911f Use getStateID for playAuxSFX 2016-01-23 23:29:19 +01:00
Ellpeck
fbc5c5240d Rebalanced canola oil again. 
Because people were annoying me again.
 2016-01-23 22:58:40 +01:00
Ellpeck
8e7422df0f no 2016-01-23 12:20:06 +01:00
Ellpeck
54cc8eedbd Remove NEI Recipe Handlers (until it gets properly updated) 2016-01-23 12:09:29 +01:00
Ellpeck
aa30035cee Added performance settings for bad PCs 2016-01-23 11:02:35 +01:00
Ellpeck
8d59b01191 Changing some stuff to the tooltip CTRL thingy so that it looks nicer 2016-01-22 21:48:11 +01:00
Ellpeck
f89c969b24 remove todo 2016-01-22 21:43:43 +01:00
Ellpeck
f0046aadc4 remove todo 2016-01-22 19:40:15 +01:00
Ellpeck
317978787c Added metadata and nbt to the Control info for ItemStacks 2016-01-22 19:40:00 +01:00
Ellpeck
c9f3b926cc Fix Coffee Machine and Smiley Cloud bounding box 2016-01-22 19:02:04 +01:00
Ellpeck
0b3201bcf9 Ignore some Items in JEI 2016-01-22 18:52:38 +01:00
Ellpeck
6edab422c4 Fix plant right-clicking never returned any seeds 2016-01-22 18:27:28 +01:00
Ellpeck
6d719f781c "Fix" smiley cloud bounding box. 
For now.
 2016-01-22 12:25:10 +01:00
Ellpeck
263004d4b4 Made phantom booster cheaper 2016-01-21 21:32:08 +01:00
Ellpeck
c7ccab75b8 Cheap workaround for glitching into some blocks with a smaller hitbox causing graphical glitches and damaging the player 2016-01-21 19:59:26 +01:00
Ellpeck
c4f8e67d64 Why was that there? 2016-01-21 19:43:06 +01:00
Ellpeck
ac5d789c78 "nice" 2016-01-20 20:30:39 +01:00
Ellpeck
fd5253846f Merge pull request #60 from XDjackieXD/master 
winey winey
 2016-01-20 20:28:44 +01:00
XDjackieXD
2610bb8699 Make the floaty special thingie move more awesome! 2016-01-20 20:24:16 +01:00
Ellpeck
037df04965 I don't know what ImmutableList is. 
So I'm not using it.
/shrugs
 2016-01-20 20:09:03 +01:00
Ellpeck
223db4e04e Transmaterial Differentiator 2016-01-19 21:56:45 +01:00
Ellpeck
ca30b483e1 Ignore NBT Tags of Energy items in JEI 2016-01-18 23:38:52 +01:00
Ellpeck
acc75f5313 ..fixed assets derping because of wrong capitalization 2016-01-18 21:38:18 +01:00
Ellpeck
5ca0fd53d3 Reconstructor recipe handler 2016-01-17 22:57:32 +01:00
Ellpeck
924e7da95f to be safe3 2016-01-17 20:50:25 +01:00
Ellpeck
4b835f8df8 Custom packet handler for 98.7% less stack traces when joining worlds 2016-01-17 20:46:51 +01:00
Ellpeck
060a4dcbb3 red mushroom -> nether wart in Reconstructor 2016-01-17 20:12:20 +01:00
Ellpeck
1a258f8ed5 Fixed the drill's 3x3 and 5x5 mining acting weird on servers 2016-01-17 19:22:14 +01:00
Ellpeck
2189dde1a0 JEI Crusher 2016-01-17 15:09:59 +01:00
Ellpeck
59d835ed4f Added Coffee Machine JEI recipe 
Removed some stuff from the API that doesn't really belong there
 2016-01-17 12:17:24 +01:00
Ellpeck
957acd8ab8 Fixed lenses not syncing correctly on the server when converting Item entities 2016-01-17 01:50:35 +01:00
Ellpeck
a4f2251ff6 Removed INEIRecipeHandler and RecipeWrapperWithButton from the API. 
They won't work that way.
/shrugs
 2016-01-17 01:14:30 +01:00
Ellpeck
e130f89296 Added proper JEI Handler for booklet 
Added RecipeWrapperWithButton to API
 2016-01-17 01:09:36 +01:00
Ellpeck
b76d96c303 removed INEIRecipeHandler away from the API. 
I don't know why it was there.
API version 5
 2016-01-16 23:47:06 +01:00
Ellpeck
720f80160b Made word count reload when reloadoing resources 2016-01-16 23:14:10 +01:00
Ellpeck
3397632e87 Started JEI Implementation. 2016-01-16 20:06:25 +01:00
Ellpeck
07c24cf8dc Fixed the mess blur created 2016-01-16 14:14:39 +01:00
Patrick Emery
62a4b04e6f Added right-click harvest functionality to all crops. 2016-01-15 21:39:38 -05:00
Kristian295
95970617f4 Molecular Transformilator 
Just added line 713 from en_US.

There will be more translating going on later this weekend!
 2016-01-15 23:08:16 +01:00
Ellpeck
ddc1ab7ce5 Molecular Transformilator 2016-01-15 22:05:36 +01:00
Ellpeck
352604aac1 Updated the stuff to the other stuff. 
In layman's terms: Made 1.8 the master branch.
 2016-01-13 21:48:48 +01:00
Patrick Walker
0629b53d30 Fixed texture name 2016-01-11 18:34:06 -05:00
Patrick Walker
dbebafb1e5 Update itemSwordQuartz.json 2016-01-11 18:33:40 -05:00
Ellpeck
ab0adfa25b Revert the fix, tried to fix it another way 2016-01-11 22:41:33 +01:00
Ellpeck
85428e885d Workaround for a bug that broke the packet handling 2016-01-11 22:33:54 +01:00
Ellpeck
dbf8093ea0 fml 2016-01-11 22:15:50 +01:00
Ellpeck
f014b1af57 r23 ~ 2016-01-11 22:02:41 +01:00
Ellpeck
5b166a784f Fixed a ginormous bug that fucked up crafting. 
I hope.
 2016-01-11 21:56:01 +01:00
Ellpeck
d3950d257c Fixed wild plants dropping the wrong seeds. 2016-01-11 18:55:39 +01:00
Ellpeck
b8b94b91f1 Fixed some more bugs, update the update checker to check for betas as well~ 2016-01-11 18:27:47 +01:00
Ellpeck
e15d1fa882 Actually fix the new update checker 2016-01-10 21:00:12 +01:00
Ellpeck
2620687e2d Added the new update checker for 1.8 as well 2016-01-10 20:59:13 +01:00
Ellpeck
5bc747f6aa Final fixes~ 2016-01-10 20:16:19 +01:00
Ellpeck
ed833be289 Finished 1.8.9 port for the most part. 
Some stuff to fix yet though.
 2016-01-10 19:32:21 +01:00
Ellpeck
a5c97e09bd Merge pull request #44 from canitzp/1.8 
More JSONs
 2016-01-10 17:34:15 +01:00
canitzp
c645a0e770 More JSONs 2016-01-10 17:00:07 +01:00
Ellpeck
3f165f897e ALL OF THE JSONS DONE. 
Now I just need to wait for canitzp to finish the special models~
 2016-01-10 15:29:45 +01:00
Ellpeck
390c1289f8 Merge pull request #43 from canitzp/1.8 
More JSONs
 2016-01-10 15:18:56 +01:00
canitzp
0cb9d6f8c9 More JSONs 2016-01-10 15:12:48 +01:00
canitzp
0b68b7e296 More JSONs 2016-01-10 15:12:20 +01:00
Ellpeck
860ef3d0ef Moooooar texture work ~ 2016-01-10 02:51:31 +01:00
Ellpeck
5e0e79d691 Some more texture work & fixing. 
Nothing special.
Well, lots of special stuff actually.
 2016-01-10 01:17:17 +01:00
canitzp
0f090df466 Merge remote-tracking branch 'origin/1.8' into 1.8 2016-01-09 18:37:52 +01:00
canitzp
15c03f2a43 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:30 +01:00
canitzp
f18dfa97c8 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:21 +01:00
Ellpeck
bca7812097 Merge pull request #40 from canitzp/1.8 
-Coffee Machine JSON \o/
 2016-01-09 18:08:42 +01:00
canitzp
8efe5482f8 -Coffee Machine JSON \o/ 2016-01-09 18:07:18 +01:00
Ellpeck
4ed17950b9 Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ 2016-01-09 17:53:06 +01:00
Ellpeck
0d00143298 Maybe fixed a bug caused by desync that would cause blocks to have ridiculous amounts of energy/luqiuid 2016-01-09 17:30:24 +01:00
Ellpeck
61b921b2dd Some more texture work. 
Done for now.
Hahah.
Good joke.
 2016-01-09 14:35:04 +01:00
Ellpeck
fec10edbc2 Loooots more texture work. 
Okay, I'm done for today.
 2016-01-09 02:36:43 +01:00
Ellpeck
2babb6cf0b Some more texture work, fixed Special Render for items 2016-01-09 00:04:30 +01:00
Ellpeck
6db479f94e More stuff & special render fix testing 2016-01-08 23:36:35 +01:00
Ellpeck
8f959c92aa More Fixes °~° 
Continuing some other time.
 2016-01-08 21:55:39 +01:00
Ellpeck
51872bbc23 Dis game is ass - More textures 2016-01-08 20:51:03 +01:00
Ellpeck
98efec99d0 Fixed knife crafting being broken 2016-01-08 18:09:11 +01:00
Ellpeck
77860267da ITEMS AND BLOCKS RENDER 
Well.
Not all of them.
 2016-01-08 17:25:31 +01:00
Ellpeck
c08d2221fa This doesn't work. 2016-01-08 16:52:53 +01:00
Ellpeck
020384f5ff Put Version and API Name in main class 2016-01-08 15:33:19 +01:00
Ellpeck
6693636247 Bump API version. 
If I don't do it now, I'll forget.
 2016-01-08 15:26:52 +01:00
Ellpeck
92b9b7a844 Some more "minor fixes", if you want to call it that. 
(I declare you completely nuts if you do, though.)
 2016-01-08 15:21:05 +01:00
Ellpeck
f602eccca0 Remove Position. 
Don't need it.
 2016-01-08 13:31:58 +01:00
Ellpeck
6ee039fcc2 Fix some other minor bugs that I found quickly. 
I really need to start working on actually repairing the textures.
 2016-01-08 08:18:27 +01:00
Ellpeck
5a1b6f9d78 Fixed a bug with the crafting page. 
//Like that would matter..
 2016-01-08 08:13:42 +01:00
Ellpeck
0ca8fc90c1 IT RUNS! 
No textures though.
And lots of bugs.
 2016-01-08 08:10:55 +01:00
Ellpeck
b2a00d2c8d Sooo.. yea, I'm still at it. 
And still not compilable.
Oh god.
 2016-01-07 23:42:43 +01:00
Ellpeck
020745a813 Remember how I said "I'm nearing the end of bugfixing"? 
Well that was a lie apparently.
 2016-01-07 21:41:28 +01:00
Ellpeck
db1e183e45 Another status update. 
Getting to the finish line when it comes to removing compile-breaking bugs!
 2016-01-07 19:47:53 +01:00
Ellpeck
02e66e23df PROGRESS!! 
Yes, this will be progress updates.
A lot.
 2016-01-07 19:04:29 +01:00
Ellpeck
d39fb82992 EVERYTHING IS BROKEN 2016-01-07 18:21:00 +01:00
Ellpeck
1b176008a5 Made the solar thingy cheaper. 2016-01-07 16:07:23 +01:00
Ellpeck
dae0a9a0b4 Balanced the magnet ring a bit °~° 2016-01-07 16:04:25 +01:00
Ellpeck
57e77e8453 Made the growth ring a little more expensive. 2016-01-07 16:03:07 +01:00
Ellpeck
fbba25d5ad The growth ring now only uses RF when growing stuff 2016-01-07 15:56:57 +01:00
Ellpeck
493be37ede The magnet ring now only uses RF when actually sucking items. 
Makes more sense, does it not?
 2016-01-07 15:54:41 +01:00
Ellpeck
fa79e57cb6 Made looking up the double furnace in the booklet possible 2016-01-06 19:58:59 +01:00
Ellpeck
5ef8626a40 Fix another stupid obfuscation bug :x 2016-01-06 18:10:01 +01:00
Ellpeck
a135ecf32c r19! Sorry for this update >_> 2016-01-06 05:28:31 +01:00
Ellpeck
f16f1e0496 Fixed a nasty bug with obfuscation causing some booklet pages to break horribly 2016-01-06 05:17:54 +01:00
Ellpeck
1fae94f578 Added the Booklet stuff to the API 2016-01-05 14:57:50 +01:00
Ellpeck
11c4f90080 Actually do the API declaration right 2016-01-05 04:56:34 +01:00
Ellpeck
f372e5b77f Fixed the lens of detonation not being able to activate because the power buffer was too low. 
/shrugs
 2016-01-05 04:52:53 +01:00
Ellpeck
77ba946306 Added an API. 2016-01-05 04:47:37 +01:00
Ellpeck
c0a6ee8f85 Bacon recipe & doc. 
Why am I doing this to myself.
 2016-01-04 17:34:06 +01:00
Ellpeck
2f0a4d79e7 Fix server 2016-01-04 17:26:24 +01:00
Ellpeck
5bd1926453 Added bacon 2016-01-04 17:25:03 +01:00
Ellpeck
4cecbc491e "Light Black"? What's that supposed to be? 2016-01-03 23:21:52 +01:00
Glenthor
260978bc53 -Added Crystal Tools and Armor 2016-01-03 23:16:41 +01:00
Ellpeck
99a786e496 Made config optioin for less laser particles make more sense 2016-01-03 19:59:24 +01:00
Ellpeck
2453fe2477 Changed Laser Relay particle rate yet again 2016-01-03 19:58:01 +01:00
Ellpeck
aa0ec6a575 Fixed booklet achievement info not showing the item if it has a wildcard value 2016-01-03 19:16:43 +01:00
Ellpeck
93fcacdacb Fixed a problem with OreDict entries getting added for items with stack sizes of 8 
Closes #35
 2016-01-03 19:01:40 +01:00
Ellpeck
caf3fac208 Update Copyright 2016-01-03 16:05:52 +01:00
Ellpeck
2cadfb96ac remove sout 2016-01-02 21:37:26 +01:00
Ellpeck
6e262e2426 Fix pulsable blocks being block update detectors (xdjackiexd) 2016-01-02 21:36:42 +01:00
Ellpeck
96225522c4 No Minetweaker. 
Not happening.
 2016-01-02 02:45:44 +01:00
Ellpeck
f71e4d741b Make it work actually 2016-01-02 02:17:17 +01:00
Ellpeck
ff741068c2 MineTweaker test..? I guess? 2016-01-02 02:16:11 +01:00
Ellpeck
6ad4f39258 Fix all the things 2016-01-02 00:02:44 +01:00
Ellpeck
8fba543f21 Crystals and their tools now have colored names 2016-01-01 23:54:36 +01:00
Ellpeck
8f3b58a730 MOAR PAXELS 2016-01-01 23:44:22 +01:00
Ellpeck
a071008059 Fix new tools/armor not being named correctly 2016-01-01 23:04:22 +01:00
Ellpeck
f67879c2f2 Fixed Quartz tools being the same as obsidian in config (duh) 2015-12-31 17:26:08 +01:00
Ellpeck
2c07e6f326 Made the White and Green wall not disableable in the config 
They look nice.
 2015-12-31 17:17:28 +01:00
Ellpeck
c10a91da29 SO MANY NEW ITEMS 
ITS ALL TOOLS AND ARMOR OMG
 2015-12-31 15:05:27 +01:00
Ellpeck
71a28f3b8f Remove unused configs 2015-12-30 23:19:02 +01:00
Ellpeck
7215a7cd80 Product placement. 
Still less annoying than Reika's Update Checkers.
 2015-12-30 23:17:03 +01:00
Ellpeck
c76627463d .de 2015-12-30 22:02:17 +01:00
Ellpeck
df59394eb0 Changelog 2015-12-30 21:39:16 +01:00
Ellpeck
f83061a00e Fix Iguana Tweaks fucking everything up because apparently it -needs- setHarvestLevel to be called even though there is getHarvestLevel() which I have made to work. 
I hate Iguana Tweaks. It breaks everything and has shit mechanics to begin with.
Closes #34
 2015-12-30 19:34:15 +01:00
Ellpeck
988989030c Made Missing Mapping Infos clearer 2015-12-28 19:01:36 +01:00
Ellpeck
25c52823c5 Ignore Mappings for missing itemSpecial, it's removed on purpose. 2015-12-28 15:07:21 +01:00
Ellpeck
a64991b75f Removed Special Drops and added Solidified Experience as own item 2015-12-28 15:05:56 +01:00
Ellpeck
d49d3ad7a9 Made Spider drops less rare 2015-12-28 14:45:36 +01:00
Ellpeck
b1b05a89fe Stopped using deprecated methods 2015-12-27 21:56:32 +01:00
Ellpeck
b15a2d0bba Illustrator's Edition 2015-12-27 17:24:13 +01:00
Ellpeck
8262461e12 Meh 2015-12-27 16:09:50 +01:00
Ellpeck
31fc8e7bfa Miner Whitelist and Blacklist config 2015-12-27 16:09:17 +01:00
Ellpeck
317bfa1de5 Booklet Info for Miner's Range 2015-12-27 15:57:14 +01:00
Ellpeck
8245e3cb8f Miner is in Ores Mode by default so that it doesn't wreck as much when you place it down while it has energy. 
//oh lovely workarounds
 2015-12-27 15:44:16 +01:00
Ellpeck
eedad2e33d Fix what I just did. 
I wanted to add MineTweaker Support, but then I noticed MineTweaker Support is really stupid and complicated so fuck it.
 2015-12-27 03:58:52 +01:00
Ellpeck
bc663fae4c Remove InterModComms. 2015-12-27 03:44:42 +01:00
Ellpeck
448a050c26 Removed Stone Casing 2015-12-26 23:48:49 +01:00
Glenthor
6c3415864c -Reworked some texures 2015-12-26 20:43:24 +01:00
Glenthor
68a994a4b6 -Reworked some textures 2015-12-26 20:41:47 +01:00
Ellpeck
1e1cd533b0 Why was that there? 2015-12-26 18:25:13 +01:00
Ellpeck
2ad42eda45 tifisgrin 2015-12-26 18:22:49 +01:00
Ellpeck
c6fe26a19a Right, that doesn't work either. 
Removed Redstone->Glowstone.
 2015-12-26 18:15:03 +01:00
Ellpeck
f089a26441 Yea, right. 
_Redstone_.
 2015-12-26 18:13:47 +01:00
Ellpeck
b51c67fa6c Disclaimer for noobs 2015-12-26 18:13:28 +01:00
Ellpeck
361cdc632c Made Breakers & Placers cheaper 2015-12-26 16:36:52 +01:00
Ellpeck
ac8f8499d2 Jam House Info Page 2015-12-25 21:56:10 +01:00
Ellpeck
576148ae95 Mark dirty when saving redstone state 2015-12-25 15:24:40 +01:00
Ellpeck
4340881896 Removed ability to close booklet with inventory key - It made John Cena unhappy 2015-12-25 00:38:16 +01:00
Ellpeck
6a7920c9d9 Revert Texture changes for update 2015-12-24 23:26:50 +01:00
Ellpeck
781dbf90dd Fixed FastCraft fucking up the booklet 2015-12-24 23:13:57 +01:00
Ellpeck
ed1147c22a Fixed FastCraft fucking up the booklet 2015-12-24 23:13:46 +01:00
Ellpeck
4a1d791f62 #BlameShadowfacts 2015-12-24 02:43:51 +01:00
Ellpeck
99c5c27a51 no 2015-12-24 00:35:33 +01:00
Ellpeck
7dd939999c Fixed blocks activating too often in redstone pulse mode 2015-12-24 00:34:47 +01:00
Ellpeck
583d6e025e Fixed Fake Player 2015-12-23 23:14:39 +01:00
Ellpeck
732da75c9f Placers can now place Redstone 2015-12-23 23:09:50 +01:00
Ellpeck
a961870cac Fixed Smiley Cloud's and Laser Relay's Collision Bounding Box sometimes freaking out 2015-12-23 22:44:25 +01:00
Ellpeck
89978a5c8c Made Laser Relays less particle render heavy - But also less good looking. 
Gotta find a better solution at some point.
 2015-12-23 22:03:17 +01:00
Ellpeck
a712c1540c Merge remote-tracking branch 'origin/master' 2015-12-23 20:42:35 +01:00
Ellpeck
2ea19830fa Always use StringUtil's renderSplitString 2015-12-23 20:42:20 +01:00
Glenthor
da88d898b7 -Reworked some textures 2015-12-23 18:24:09 +01:00
Ellpeck
c7a1a5965f Made Slabs become the right double slabs >_> 2015-12-23 16:13:40 +01:00
Ellpeck
17f8c3b659 Made Lava Factory update RF properly 2015-12-23 14:03:41 +01:00
Ellpeck
7179fb01d1 Made the compost update when putting things in with automation (damn.) 2015-12-23 13:06:12 +01:00
Ellpeck
8b20fc066e Removed World from WorldPos, renamed it to Position. 
That fixed loads of issues.
 2015-12-23 01:43:49 +01:00
Ellpeck
ed2bbe226a Revert 2015-12-23 01:15:43 +01:00
Ellpeck
b98e6839e4 Fixed a bug with WorldPos not returning the right thing on clients 2015-12-23 01:08:27 +01:00
Ellpeck
11c78bf455 Fixed a stupid NP that crashed the BTM server. 
*Hangs himself in shame now*
 2015-12-23 00:38:39 +01:00
Ellpeck
62aa68560c Fixed some items not being recognized by the right-click function in the booklet 2015-12-22 20:43:41 +01:00
Ellpeck
3378ff088f Fixed plants sometimes dropping completely nonsensical seed metas 2015-12-22 18:10:49 +01:00
Ellpeck
924011768d Rebalance canola to be more item-giving 2015-12-22 17:54:55 +01:00
Ellpeck
cb25abfacc Made Booklet info be placed better 2015-12-22 17:44:40 +01:00
Ellpeck
2849a1dc44 Le SideOnly 2015-12-22 16:14:05 +01:00
Ellpeck
0b70946487 Sneak-Right-Clicking with a book on a block from ActAdd will now open its page 2015-12-22 16:08:53 +01:00
Ellpeck
1806cd1820 Removed Green Dye Icon 2015-12-22 15:26:30 +01:00
Ellpeck
7ef84608fa Removed green dye. 
No one used it anyways.
Even I forgot it existed.
 2015-12-22 15:23:19 +01:00
Ellpeck
f22ca0c21c Fix rendering items on the overlay making it go all dark 2015-12-22 15:01:40 +01:00
Ellpeck
9cbd9cc6b6 How about we actually fix everything whoops 2015-12-22 14:58:25 +01:00
Ellpeck
44b100758e Tweaked some things, only code-wise 2015-12-22 14:55:10 +01:00
Ellpeck
b5349c2869 Fix Server & Texts overlapping 2015-12-22 07:28:27 +01:00
Ellpeck
252fbab4ec Manual stand now has hud info 2015-12-22 00:30:08 +01:00
Ellpeck
47b79ce8ea Compost shows the amount of items in the HUD now 2015-12-22 00:04:48 +01:00
Ellpeck
ad23456456 Reconstructor now shows item 2015-12-21 23:53:01 +01:00
Ellpeck
5078007335 Made Phantom Hud be less likely to overlap 2015-12-21 23:40:19 +01:00
Ellpeck
5239818e97 Cleanup~ 2015-12-21 22:46:23 +01:00
Ellpeck
e6b10a63d3 Made Reconstructor show its lens 2015-12-21 22:28:57 +01:00
Ellpeck
17da38c095 Fix server 2015-12-21 22:22:02 +01:00
Ellpeck
92dc77839d Added fancy hud display instead of chat messages to most blocks 2015-12-21 22:18:33 +01:00
Ellpeck
1a13ef9b13 Removed Waila compat. 
I didn't need it anyways.
 2015-12-21 20:43:49 +01:00
Ellpeck
18f9ec4ce2 How about we -actually- revert it. 2015-12-20 23:39:51 +01:00