Harmonic e24b2afa31 Merge branch 'dev' into 'patch-3' ... # Conflicts: # src/main/java/com/eu/habbo/messages/incoming/guilds/RequestGuildBuyEvent.java		2020-09-25 17:03:57 -04:00
..
core	Merge branch 'NullExceptions' into 'dev'	2020-09-19 13:16:50 -04:00
crypto	Dependencies and logging progress	2020-05-04 19:54:07 +02:00
database	Dependencies and logging progress	2020-05-04 19:54:07 +02:00
habbohotel	Merge branch 'dev' into 'dev'	2020-09-25 17:02:15 -04:00
messages	Merge branch 'dev' into 'patch-3'	2020-09-25 17:03:57 -04:00
networking	Apply suggestion to src/main/java/com/eu/habbo/networking/Server.java	2020-05-24 16:33:48 -04:00
plugin	Merge branch 'buildheight_stackable_event' into 'dev'	2020-09-19 13:16:11 -04:00
threading	Football fixes	2020-09-13 07:25:05 +02:00
util	Fixes MachineID sometimes not unique #620.	2020-05-28 22:21:31 +02:00
Emulator.java	2.4.0 Stable. Changed Version String.	2020-09-06 13:25:46 +01:00