Merge branch 'dev' into 'wired-to-json'
# Conflicts: # sqlupdates/2_4_0 to 3_0_BETA_1.sql
Showing
- sqlupdates/2_4_0 to 3_0_BETA_1.sql 2 additions, 0 deletionssqlupdates/2_4_0 to 3_0_BETA_1.sql
- src/main/java/com/eu/habbo/habbohotel/commands/CommandHandler.java 1 addition, 0 deletions...java/com/eu/habbo/habbohotel/commands/CommandHandler.java
- src/main/java/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java 54 additions, 0 deletions...va/com/eu/habbo/habbohotel/commands/RoomBadgeCommand.java
- src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionEffectTile.java 8 additions, 1 deletion.../habbohotel/items/interactions/InteractionEffectTile.java
- src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionFireworks.java 102 additions, 20 deletions...o/habbohotel/items/interactions/InteractionFireworks.java
- src/main/java/com/eu/habbo/habbohotel/rooms/Room.java 13 additions, 2 deletionssrc/main/java/com/eu/habbo/habbohotel/rooms/Room.java
Loading
Please register or sign in to comment