Commit Graph

1581 Commits

Author SHA1 Message Date
Harmonic
4ea550f34e Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev
 Conflicts:
	README.md
2023-10-25 18:40:41 +01:00
Oliver
fc16859817 Update links in README 2023-01-16 02:19:53 +00:00
Harmonic
f051d1d155 Backported some minor fixes from ms4, credits to brenoepic. 2023-01-04 18:45:55 -08:00
Harmonic
4340261506 Merge branch 'dev' of https://git.krews.org/morningstar/Arcturus-Community into dev 2023-01-04 18:43:32 -08:00
John
51343af9c3 Merge branch 'dev' into 'dev'
SSL Error handeling & Proxy information in connection

See merge request morningstar/Arcturus-Community!14
2023-01-05 02:42:05 +00:00
DuckieTM
dca6fbadfa SSL Error handeling & Proxy information in connection 2023-01-05 02:42:05 +00:00
John
33c82e0b8f Merge branch 'dev' into 'dev'
Fixes the song disk bug

See merge request morningstar/Arcturus-Community!15
2023-01-05 02:34:12 +00:00
Harmonic
9a10a2ea77 3.5.2
Expected to be the final commit for 3.x except for security hotfixes.
2023-01-04 18:29:40 -08:00
Julimar Melo
3858483988 Fixes the song disk bug 2023-01-03 01:36:03 -03:00
Arpy Age
3bd6b8d461 Merge branch 'move-catalogItem-fix' into 'dev'
For for sold out LTDs not being moved to the specified Sold Out page

See merge request morningstar/Arcturus-Community!4
2022-12-13 16:08:03 +00:00
Yordi
804237cc4e For for sold out LTDs not being moved to the specified Sold Out page 2022-12-13 16:58:30 +01:00
breno epic
26e06ee0c7 Revert "Create main.yml"
This reverts commit 5adea8e712
2022-12-10 18:04:28 +00:00
Breno Andrade
5adea8e712
Create main.yml 2022-12-07 08:56:28 -03:00
Harmonic
d9e1ce81bd Merge branch 'dev' into 'master'
Update README.md

See merge request morningstar/Arcturus-Community!581
2022-11-16 16:17:48 +00:00
Harmonic
5e241e9312 Update README.md 2022-11-16 16:17:48 +00:00
Harmonic
475912bde7 Update README.md 2022-11-16 16:14:42 +00:00
Harmonic
cd457d61f8 Merge branch 'dev' into 'master'
Revert changes to teams

See merge request morningstar/Arcturus-Community!580
2022-11-16 16:05:09 +00:00
Harmonic
e9ae737c90 Revert changes to teams 2022-11-16 16:05:09 +00:00
Harmonic
53c48a06f1 Revert "Merge branch 'dev' into 'dev'"
This reverts merge request !529
2022-11-16 16:04:02 +00:00
Harmonic
353a01f563 Merge branch 'dev' into 'master'
fixed master and dev changes

See merge request morningstar/Arcturus-Community!579
2022-11-16 15:56:06 +00:00
Harmonic
c2a659483c fixed master and dev changes 2022-11-16 15:56:06 +00:00
ArpyAge
a24bed7001 Fixed WordFilter Code 2022-11-13 14:15:03 +01:00
ArpyAge
8ee87fcdd9 Permission error fix when plugin added new permission 2022-10-13 19:45:58 +02:00
ArpyAge
50f0dc7fb8 Fixed staff picks error 2022-09-27 00:01:55 +02:00
ArpyAge
b6f3214cc8 Fixed bug where staff picks would not appear after someone searched in public rooms 2022-09-17 01:36:34 +02:00
ArpyAge
bb6a2e5eac Set all credits/points event to the same method, added cancel for login event 2022-09-12 20:20:14 +02:00
ArpyAge
09b8b07d20 Made it so the floorplan settings were actually being used 2022-09-06 01:28:51 +02:00
ArpyAge
a5e9550ab6 fixed sql update 2022-05-03 18:21:29 +02:00
ArpyAge
1449ee1741 Merge branch 'dev' into 'master'
3.5.0

Closes #980 and #824

See merge request morningstar/Arcturus-Community!554
2022-04-20 23:58:28 +00:00
Harmonic
d3762c9b87 Revert "Merge branch 'refactor/wired-saving' into 'dev'"
This reverts merge request !507
2022-04-20 23:55:55 +00:00
Harmonic
8236fba2f7 3.5.0 tag 2022-04-20 16:48:38 -07:00
ArpyAge
fa0f58b87f Custom stacking setting to stack bigger items on top of smaller ones 2022-04-17 03:39:55 +02:00
Harmonic
098d6a6684 Merge branch 'fix-floorplaneditor' into 'dev'
add null check

See merge request morningstar/Arcturus-Community!549
2022-04-15 21:50:52 +00:00
brenoepic
d9d24d9073 add null check 2022-04-15 15:41:32 -03:00
Harmonic
8724c301ba Merge branch 'rcon-change-username' into 'dev'
Added new RCON command (Change Username)

See merge request morningstar/Arcturus-Community!547
2022-04-15 01:25:22 +00:00
Harmonic
1d28111207 Merge branch 'fix-badges-code' into 'dev'
Removed deprecated from badges

See merge request morningstar/Arcturus-Community!546
2022-04-15 01:03:52 +00:00
Snaiker
609cfd4fe3 Added new RCON command 2022-04-15 02:02:35 +01:00
Snaiker
2a6e81ef05 Check if the offline user exists 2022-04-15 01:29:06 +01:00
Snaiker
9dad818fda Removed old code 2022-04-15 01:19:50 +01:00
Harmonic
6e03fe294e fixed featurelist.md layout on gitlab 2022-04-14 23:47:10 +00:00
ArpyAge
631dbe9d38 Changed order or operations so Buildheight event can override max/min height of tiles 2022-04-15 01:08:23 +02:00
Harmonic
96b5b29bed add featurelist.md 2022-04-14 23:03:01 +00:00
Harmonic
7e2beb83ce Merge branch 'fix-mannequin' into 'dev'
Fix mannequin name

See merge request morningstar/Arcturus-Community!539
2022-04-14 22:23:36 +00:00
Harmonic
8442d72750 Merge branch 'fix-inventories' into 'dev'
Fix empty inventories

See merge request morningstar/Arcturus-Community!544
2022-04-14 22:13:54 +00:00
brenoepics
002c53e8bb Update src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java 2022-04-14 19:07:10 +00:00
brenoepics
471dae3068 Fix empty inventories 2022-04-14 19:01:22 +00:00
Harmonic
ffc24bfb2e Merge branch 'fix-duplicated-badge' into 'dev'
Change the condition

See merge request morningstar/Arcturus-Community!543
2022-04-14 13:11:06 +00:00
ArpyAge
dd704b6db7 items with lay for wired.place.under 2022-04-14 01:26:23 +02:00
Snaiker
da5ef038aa Change 2022-04-13 14:35:37 +01:00
Bill
d8e4fbe2da Merge branch 'fix-duplicated-badge' into 'dev'
Fix Achievements Badge

See merge request morningstar/Arcturus-Community!541
2022-04-13 04:55:43 +00:00