Commit Graph

431 Commits

Author SHA1 Message Date
ecea7f716b Merge branch 'develop' into 'master'
Update .gitlab-ci.yml

See merge request discord-bots/chaosbot!22
2020-08-15 14:07:13 -04:00
1134cce777 Update .gitlab-ci.yml 2020-08-15 14:06:55 -04:00
3ec35357e0 Merge branch 'develop' into 'master'
Update .gitlab-ci.yml

See merge request discord-bots/chaosbot!21
2020-08-15 13:49:33 -04:00
d689feb6b7 Update .gitlab-ci.yml 2020-08-15 13:48:51 -04:00
f0aefc321f Merge branch 'develop' into 'master'
Update .gitlab-ci.yml

See merge request discord-bots/chaosbot!20
2020-08-15 13:40:37 -04:00
2a9ccb83ad Update .gitlab-ci.yml 2020-08-15 13:40:18 -04:00
9b890aa7ba Merge branch 'develop' into 'master'
Update .gitlab-ci.yml

See merge request discord-bots/chaosbot!19
2020-08-15 13:34:22 -04:00
679393ec40 Update .gitlab-ci.yml 2020-08-15 13:34:04 -04:00
cb760ca752 Merge branch 'develop' into 'master'
Update .gitlab-ci.yml

See merge request discord-bots/chaosbot!18
2020-08-15 13:26:13 -04:00
16908ecf2c Update .gitlab-ci.yml 2020-08-15 13:25:43 -04:00
610997cde8 Merge branch 'develop' into 'master'
Develop

See merge request discord-bots/chaosbot!17
2020-08-15 13:13:41 -04:00
2bffde182c Update .gitlab-ci.yml 2020-08-15 13:13:10 -04:00
ca7f6913a6 Update .gitlab-ci.yml 2020-08-15 13:10:10 -04:00
14237b35c3 For now... the update to the pipeline from ptero to portainer 2020-08-14 21:23:30 -04:00
965f0088f2
Merge branch 'develop' into master 2020-08-14 17:36:32 +02:00
9087ba9358
Fix of freecompany triggering default as well 2020-08-14 17:35:50 +02:00
0e3c3f0d22
Merge branch 'develop' into master 2020-08-13 22:38:16 +02:00
e8fd7a47a4
Register reset command 2020-08-13 22:38:06 +02:00
61ef1e0ed9
Add delete configuration flag 2020-08-13 22:37:45 +02:00
d54bc43ed7
Merge branch 'develop' into master 2020-08-13 21:17:07 +02:00
dc986457e5
I fucked up when to ignore lodestone tests 2020-08-13 21:16:52 +02:00
d32973e7ba
Merge branch 'develop' into master 2020-08-13 21:11:32 +02:00
d71f4ac3c6
Implement disabling the exp module 2020-08-13 21:11:15 +02:00
ff854df99d
Enable the possibility to disable a module 2020-08-13 21:11:06 +02:00
1521df23fd
Fix indenting and add comment for future 2020-08-13 20:43:00 +02:00
55fcb3f645
Merge branch 'develop' into master 2020-08-11 04:47:18 +02:00
9f34dd7864
So, the lodestone is down... now our tests are failing, here's a fix... 2020-08-11 04:46:10 +02:00
59bbe14885 Merge branch 'develop' into 'master'
Merge refactoring of the levelup system

See merge request discord-bots/chaosbot!16
2020-08-10 22:17:33 -04:00
79ff643a2e
Fail-safe the type on the LevelUp:MentionUser tag 2020-08-11 04:12:27 +02:00
23d8db2a4d
General type and naming scheme fixes 2020-08-11 03:59:50 +02:00
4ed91ede81
Adjust CheckLevel signature to be a pure method 2020-08-11 03:58:35 +02:00
8bdacb5328
Refactor the levelup code to a more sensible order of operations 2020-08-11 03:57:38 +02:00
ad0ea126e8
Invert minute timeout check 2020-08-11 03:28:58 +02:00
c0acf1ff79
Rename AddXp function to proper naming convention 2020-08-11 03:26:28 +02:00
3f2370a4bc
Merge branch 'develop' into master 2020-08-11 02:47:11 +02:00
7c22efbb49
Add mention username/nickname if mentions are not desired. 2020-08-11 02:45:35 +02:00
e270904647 Updating for new Formula 2020-08-10 19:07:03 -04:00
7c4ea8e2d5 Merge branch 'develop' into 'master'
Develop

See merge request discord-bots/chaosbot!15
2020-08-10 00:05:02 -04:00
96561089c2 Adding Nicknaming on Link 2020-08-10 00:04:15 -04:00
44df5790c6 Updating for :wot: emoji, and also to permit the status joni / welcome to ONLY send to system status channel 2020-08-09 23:48:06 -04:00
f332c1c368 Merge branch 'develop' into 'master'
Develop

See merge request discord-bots/chaosbot!14
2020-08-09 11:01:46 -04:00
0fdcbd0968 Adding Welcome and Goodbye 2020-08-09 11:01:19 -04:00
60845644bb Fixing Level NextXP Formula 2020-08-09 10:35:53 -04:00
bd426f44ea Merge branch 'develop' into 'master'
Setting default level to 1

See merge request discord-bots/chaosbot!13
2020-08-09 10:20:22 -04:00
9950801644 Setting default level to 1 2020-08-09 10:19:29 -04:00
9a3d3f21aa Merge branch 'develop' into 'master'
Fixing Formula for leveling.

See merge request discord-bots/chaosbot!12
2020-08-09 10:10:43 -04:00
038cd37995 Fixing Formula for leveling. 2020-08-09 10:10:19 -04:00
dbb2d52bec Merge branch 'develop' into 'master'
Fixing Typo

See merge request discord-bots/chaosbot!11
2020-08-09 10:00:21 -04:00
5bae7d8e50 Fixing Typo 2020-08-09 09:59:57 -04:00
1f4f2fe555 Merge branch 'develop' into 'master'
Customizing output of congrats msg as per Luna

See merge request discord-bots/chaosbot!10
2020-08-09 09:53:00 -04:00