Skip to content

[WIP] API changes#109

Merged
SupremeMortal merged 135 commits into
CloudburstMC:bleedingfrom
Sleepybear:api-changes
Apr 18, 2021
Merged

[WIP] API changes#109
SupremeMortal merged 135 commits into
CloudburstMC:bleedingfrom
Sleepybear:api-changes

Conversation

@Sleepybear

Copy link
Copy Markdown
Contributor

Still a WIP

Creeperface01 and others added 30 commits September 10, 2020 19:04
# Conflicts:
#	src/main/java/org/cloudburstmc/server/level/Level.java
#	src/main/java/org/cloudburstmc/server/player/Player.java
# Conflicts:
#	src/main/java/org/cloudburstmc/server/block/behavior/BlockBehavior.java
#	src/main/java/org/cloudburstmc/server/blockentity/impl/FlowerPotBlockEntity.java
#	src/main/java/org/cloudburstmc/server/blockentity/impl/ItemFrameBlockEntity.java
#	src/main/java/org/cloudburstmc/server/inventory/CraftingManager.java
#	src/main/java/org/cloudburstmc/server/item/ItemUtils.java
#	src/main/java/org/cloudburstmc/server/item/behavior/ItemBucketBehavior.java
#	src/main/java/org/cloudburstmc/server/level/Level.java
#	src/main/java/org/cloudburstmc/server/level/generator/standard/StandardGeneratorUtils.java
#	src/main/java/org/cloudburstmc/server/registry/ItemRegistry.java
# Conflicts:
#	src/main/java/org/cloudburstmc/server/player/handler/PlayerPacketHandler.java
# Conflicts:
#	src/main/java/org/cloudburstmc/server/item/behavior/ItemBucketBehavior.java
# Conflicts:
#	src/main/java/org/cloudburstmc/server/level/generator/standard/misc/selector/BlockSelectorDeserializer.java
# Conflicts:
#	src/main/java/org/cloudburstmc/server/block/behavior/BlockBehaviorGrass.java
#	src/main/java/org/cloudburstmc/server/block/behavior/ReedsBlockBehavior.java
#	src/main/java/org/cloudburstmc/server/blockentity/impl/BrewingStandBlockEntity.java
#	src/main/java/org/cloudburstmc/server/entity/impl/EntityLiving.java
#	src/main/java/org/cloudburstmc/server/entity/impl/projectile/EntityFishingHook.java
#	src/main/java/org/cloudburstmc/server/entity/impl/vehicle/EntityBoat.java
#	src/main/java/org/cloudburstmc/server/entity/impl/vehicle/EntityTntMinecart.java
#	src/main/java/org/cloudburstmc/server/inventory/BaseInventory.java
#	src/main/java/org/cloudburstmc/server/inventory/CraftingManager.java
#	src/main/java/org/cloudburstmc/server/item/behavior/Item.java
#	src/main/java/org/cloudburstmc/server/item/behavior/ItemBowBehavior.java
#	src/main/java/org/cloudburstmc/server/item/behavior/ItemTridentBehavior.java
#	src/main/java/org/cloudburstmc/server/item/food/Food.java
#	src/main/java/org/cloudburstmc/server/level/generator/standard/StandardGeneratorUtils.java
#	src/main/java/org/cloudburstmc/server/plugin/loader/JavaPluginLoader.java
#	src/main/java/org/cloudburstmc/server/registry/ItemRegistry.java
@SupremeMortal SupremeMortal merged commit 0f49dae into CloudburstMC:bleeding Apr 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants