Changes

Summary

Add back Overworld and Nether berry bushes, Bump Forge & mod versions, (details)

Commit adf4a4966fb9cba7a6ff2e977bc7f29777af5243 by alexbegt Add back Overworld and Nether berry bushes, Bump Forge & mod versions, and add more food.
The file was added	src/main/resources/assets/natura/textures/items/food/duskberry.png
The file was added	src/main/resources/assets/natura/textures/items/food/blightberry.png
The file was modified	src/main/java/com/progwml6/natura/nether/NaturaNether.java (diff)
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/maloberry.png
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/raspberry.png
The file was added	src/main/resources/assets/natura/blockstates/overworld_berrybush_raspberry.json
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/blueberry.png
The file was added	src/main/resources/assets/natura/blockstates/overworld_berrybush_maloberry.json
The file was added	src/main/resources/assets/natura/models/block/natura_bush_small.json
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/blightberry.png
The file was added	src/main/resources/assets/natura/blockstates/overworld_berrybush_blueberry.json
The file was added	src/main/resources/assets/natura/textures/items/food/raspberry.png
The file was modified	src/main/java/com/progwml6/natura/overworld/OverworldClientProxy.java (diff)
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/blackberry.png
The file was modified	src/main/resources/assets/natura/blockstates/edibles.json (diff)
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/blightberry_ripe.png
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/blackberry_ripe.png
The file was added	src/main/resources/assets/natura/textures/items/food/maloberry.png
The file was added	src/main/resources/assets/natura/textures/items/food/skyberry.png
The file was added	src/main/java/com/progwml6/natura/overworld/block/bush/BlockOverworldBerryBush.java
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/stingberry_ripe.png
The file was modified	src/main/java/com/progwml6/natura/overworld/NaturaOverworld.java (diff)
The file was modified	src/main/java/com/progwml6/natura/shared/NaturaCommons.java (diff)
The file was added	src/main/resources/assets/natura/blockstates/nether_berrybush_duskberry.json
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/duskberry.png
The file was added	src/main/java/com/progwml6/natura/common/block/BlockEnumBerryBush.java
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/blueberry_ripe.png
The file was added	src/main/resources/assets/natura/models/block/natura_bush_large.json
The file was added	src/main/resources/assets/natura/blockstates/nether_berrybush_stingberry.json
The file was added	src/main/resources/assets/natura/textures/items/food/blueberry.png
The file was modified	src/main/resources/assets/natura/blockstates/soups.json (diff)
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/stingberry.png
The file was modified	build.properties (diff)
The file was added	src/main/resources/assets/natura/blockstates/overworld_berrybush_blackberry.json
The file was added	src/main/resources/assets/natura/textures/items/food/berry_medley.png
The file was modified	src/main/resources/assets/natura/lang/en_US.lang (diff)
The file was added	src/main/resources/assets/natura/textures/items/food/blackberry.png
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/skyberry.png
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/maloberry_ripe.png
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/duskberry_ripe.png
The file was added	src/main/resources/assets/natura/blockstates/nether_berrybush_skyberry.json
The file was added	src/main/resources/assets/natura/models/block/natura_bush_medium.json
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/nether/skyberry_ripe.png
The file was added	src/main/resources/assets/natura/textures/items/food/stingberry.png
The file was added	src/main/java/com/progwml6/natura/nether/block/bush/BlockNetherBerryBush.java
The file was added	src/main/resources/assets/natura/blockstates/nether_berrybush_blightberry.json
The file was modified	src/main/java/com/progwml6/natura/nether/NetherClientProxy.java (diff)
The file was added	src/main/resources/assets/natura/textures/blocks/berrybush/overworld/raspberry_ripe.png