Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] A bunch of fixes and additions #28

Merged
merged 38 commits into from
Sep 16, 2018
Merged

[WIP] A bunch of fixes and additions #28

merged 38 commits into from
Sep 16, 2018

Conversation

SoSeDiK
Copy link
Contributor

@SoSeDiK SoSeDiK commented Apr 16, 2018

Updated version to 1.7.0, updated dependencies.
Added a new SF machine (Kitchen) for CustomFood from ExoticGarden and a research for it.
Denied consuming skulls when clicked on the furnace, workbench, chest etc.
Renamed "Apple" to "Oak Apple" to avoid confusion in future.
Allowed making an Apple Juice from an Apple Oak.
Added "Dragon Fruit" (Finally! Hooray!) and basic recipes for it.
Changed CustomPotion, so now you can set a custom potion color.
Replaced all § with &.
Replaced all deprecated methods, where it was possible.
Moved schematics to their own folder (/plugins/ExoticGarden/schematics/).
Fixes for the issues #17, #19, #21, #27.
Solves #14 (will work until you install another plugin that uses the "me.mrCookieSlime.ExoticGarden.Schematic.org.jnbt" package), #24 (EG will now listen for all region protection plugins that are supported in CS-CoreLib) and #20 (I have this issue only with ORANGE_TREE, so it was fixed only for it).

break;
}
}
if (craft) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to craft something in it (a jelly sandwich) and it says the recipe cannot be found.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. It should work now :)

SoSeDiK and others added 11 commits April 19, 2018 17:12
Fixes the issue #27
Also renamed "Apple" to "Apple Oak" to avoid confusion (for example, regular apples can't be used in recipes with an apple oak).
Fixes the issue #21
Replaced spaces with tabs
Fixes the issue #17
Yeah... Forgot that is was a sapling before and there shouldn't be those blocks.
However, it'll be better if SAPLING still will be there, it's actually possible to make the flying sapling in the EG (when sapling grows then break the block under the leaves and just harvest it).
Solves #14 and #24.
Changed EG_KITCHEN to KITCHEN.
Added a research for Kitchen.
SoSeDiK added 2 commits May 4, 2018 02:16
Just syncing with my current version
Just syncing with my current version.
@SoSeDiK SoSeDiK changed the title A bunch of fixes and additions [WIP] A bunch of fixes and additions May 8, 2018
SoSeDiK added 3 commits July 21, 2018 23:25
Merging with my local reposistory.
Sorry :P
Forgot about this schematic.
@SoSeDiK
Copy link
Contributor Author

SoSeDiK commented Jul 21, 2018

Tested with Bukkit on 1.12.2. Should work fine with other versions too.
I'll be thankful if someone will test it on an actual server with players.

Moved schematics to their own folder.
Denied consuming food when clicked on a bush & fix for beds.
Denied plants harvesting while sneaking.
@galacticwarrior9
Copy link

Works fine! The update is much appreciated and has not gone unnoticed.

@Hellcode48
Copy link
Contributor

you should update to 1.13

@Ephilem
Copy link

Ephilem commented Aug 31, 2018

Hello,
Where I can have the file for my 1.13 server?

@SoSeDiK
Copy link
Contributor Author

SoSeDiK commented Aug 31, 2018

The problem is that I have no computer right now. And I'll be busy with studying for the next few months. I'll update this branch to 1.13 in my holidays /// and maybe upload my local Slimefun and CS-CoreLib forks with 1.13 support if anyone else won't, but I dropped support for everything older than 1.13, so my changes probably won't be merged.

@TheBusyBiscuit TheBusyBiscuit merged commit 393fe10 into Slimefun-Addon-Community:master Sep 16, 2018
@TheBusyBiscuit
Copy link
Member

Merged and compiled successfully.
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/ExoticGarden/master/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

5 participants