Diffusion mattata 78f14912d1fa

Merge branch 'develop' into feat/new-plugins
78f14912d1fa
Actions

Project Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'develop' into feat/new-plugins

Conflicts:
src/core/router.lua

Details

Provenance

Matt Hesketh

Authored on Feb 14 2026, 11:54 AM

Parents

R69:b940d6f04c51: Merge pull request #100 from wrxck/fix/lint-warnings
R69:73831edd3a8e: Merge branch 'develop' into feat/new-plugins

Branches

Unknown

Tags

Unknown

Event Timeline

Matt Hesketh <matt@heskethwebdesign.co.uk> committed R69:78f14912d1fa: Merge branch 'develop' into feat/new-plugins (authored by Matt Hesketh <matt@heskethwebdesign.co.uk>).Feb 14 2026, 11:54 AM

Merged Changes

b940d6f04c51 Merge pull request #100 from wrxck/fix/lint-warnings
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
f8607ea7bead fix(lint): resolve all luacheck warnings across codebase
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
5269eac2907a Merge pull request #94 from wrxck/feat/router-expansion
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
922d3bd3d5dc Merge branch 'develop' into feat/router-expansion
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
6ca54a28bd01 Merge pull request #92 from wrxck/fix/bug-fixes
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
78c5e93e672e Merge branch 'develop' into fix/bug-fixes
Author
Matt Hesketh
Browse Repository
No Builds
No Audits
fb9b23fd1da4 fix(core): resolve multiple bugs across plugins and middleware
Author
Matt Hesketh
Browse Repository
No Builds
No Audits

Changes (27)

Path

Size

src/

core/

middleware/

plugins/

admin/

customcaptcha.lua

fun/

media/

utility/

urbandictionary.lua

R69:78f14912d1fa

.env.example

Loading...

src/core/config.lua

Loading...

src/core/database.lua

Loading...

src/core/loader.lua

Loading...

src/core/router.lua

Loading...

src/middleware/blocklist.lua

Loading...

src/plugins/admin/customcaptcha.lua

Loading...

src/plugins/admin/purge.lua

Loading...

src/plugins/fun/aesthetic.lua

Loading...

src/plugins/fun/catfact.lua

Loading...

src/plugins/fun/flip.lua

Loading...

src/plugins/fun/reactions.lua

Loading...

src/plugins/media/cats.lua

Loading...

src/plugins/media/gif.lua

Loading...

src/plugins/media/itunes.lua

Loading...

src/plugins/media/youtube.lua

Loading...

src/plugins/utility/currency.lua

Loading...

src/plugins/utility/github.lua

Loading...

src/plugins/utility/inline.lua

Loading...

src/plugins/utility/lastfm.lua

Loading...

src/plugins/utility/pokedex.lua

Loading...

src/plugins/utility/setloc.lua

Loading...

src/plugins/utility/time.lua

Loading...

src/plugins/utility/urbandictionary.lua

Loading...

src/plugins/utility/weather.lua

Loading...

src/plugins/utility/wikipedia.lua

Loading...

src/plugins/utility/xkcd.lua

Loading...