Commit graph

227 commits

Author SHA1 Message Date
Maou
5e3a91524a zzzz 2025-05-11 16:57:07 +01:00
Maou
cfb49451da iiii 2025-05-11 16:35:39 +01:00
DogePrime
8b8d969ae6 Reverts items changes 2025-05-11 15:25:01 +00:00
Maou
8f52229201 testing 2025-05-11 16:22:01 +01:00
Maou
b3a3e9c0ea hmm 2025-05-11 16:18:05 +01:00
DogePrime
a9983273f8 Added back changed that were reverted 2025-05-11 14:47:51 +00:00
DogePrime
4a08b4da08 Change to Public Morals 2025-05-11 14:12:50 +00:00
Wolf
930fb9890a Merge branch 'main' into 'main'
Game title fix

See merge request Wolf/do-disciplinary-committee-members!7
2025-05-11 13:03:01 +00:00
DogePrime
f2d230269d Merge branch 'main' into 'main'
Wolf/Doge edits + my edits

See merge request DogePrime/do-disciplinary-committee-members!3
2025-05-11 12:50:00 +00:00
DogePrime
8e6d884504 Game title translation and fix 2025-05-11 12:48:14 +00:00
Wolf
bddb8f9888 Merge branch 'main' into 'main'
Wolf/Doge edits + my edits

See merge request Wolf/do-disciplinary-committee-members!6
2025-05-11 11:27:14 +00:00
d6d2dfe849 fixed some code in the intro for instant line displays 2025-05-11 05:27:36 -05:00
103621464c fixed line spacing for all Armors (CE ones as well) 2025-05-11 05:27:02 -05:00
037ea62e7a made all Skills and Passives look neat 2025-05-11 05:26:06 -05:00
dd93c8d467 smaller fixes (similar) 2025-05-11 05:25:34 -05:00
a73032cac1 Merge branch 'main' into 'main'
i believe this works

See merge request onms/do-disciplinary-committee-members!1
2025-05-11 00:45:20 -05:00
Wolf
2cce6ea6c1 Merge branch 'main' into 'main'
Reformatted dragon shrine text to be less all over the place

See merge request Wolf/do-disciplinary-committee-members!5
2025-05-11 05:38:55 +00:00
DogePrime
be04540609 Update 2 files
- /www/data/CommonEvents.json
- /www/data/Items.json
2025-05-11 05:35:46 +00:00
DogePrime
62a05df61b tweak 2025-05-11 05:26:45 +00:00
DogePrime
b3fc8d5d0b Reformatted dragon shrine text to be less all over the place 2025-05-11 04:05:50 +00:00
DogePrime
ccf581c1bd Merge branch 'main' into 'main'
go get them

See merge request DogePrime/do-disciplinary-committee-members!2
2025-05-11 02:07:06 +00:00
Maou
ec0c6a2c77 fixed the map pop and couple new line 2025-05-11 02:58:38 +01:00
Maou
f8468e2b58 Merge branch 'main' of https://gitgud.io/Wolf/do-disciplinary-committee-members 2025-05-11 00:51:09 +01:00
Maou
c02b679a3a the hell why didnt the F commit 2025-05-11 00:50:34 +01:00
Wolf
024c7077db Merge branch 'main' into 'main'
Update to 1.06

See merge request Wolf/do-disciplinary-committee-members!4
2025-05-10 23:47:24 +00:00
DogePrime
48fcf1f034 Update to 1.06 2025-05-10 23:30:41 +00:00
DogePrime
f0c8f27e36 Merge branch 'main' into 'main'
get up to date

See merge request DogePrime/do-disciplinary-committee-members!1
2025-05-10 23:07:52 +00:00
Maou
01483813ff missing a \\F 2025-05-10 23:55:43 +01:00
Maou
3d5dc9c574 Lineeeeeees 2025-05-10 19:45:15 +01:00
Maou
4901513153 Capitalize , 1st row of gallery, consistences. 2025-05-10 16:25:48 +01:00
Maou
602875e302 Maka Pinpin 2025-05-10 11:16:53 +01:00
1a84777fc9 Merge branch 'main' into 'main'
Done with npcs fixed some bug reports and new lines

See merge request dazed-translations/do-disciplinary-committee-members!13
2025-05-10 03:14:44 +00:00
Maou
135ef43063 The D inspector 2025-05-10 02:18:22 +01:00
Maou
530a4c2444 fixed the secret club crytal name 2025-05-10 01:42:45 +01:00
Maou
c7eb674d21 Fixing the names again 2025-05-10 01:18:06 +01:00
Wolf
5f69d498a6 Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!2
2025-05-09 23:21:54 +00:00
DogePrime
e793c731ef Sex Relief Committee Consistency fix 2025-05-09 23:17:38 +00:00
Maou
b0fe09bc08 Done with ABC npcs and some reported bug reports and new lines 2025-05-10 00:05:26 +01:00
DogePrime
b3e3544e59 fixes terms on porters and fixed font consistency issue with the first swimsuit porno 2025-05-09 23:02:27 +00:00
DogePrime
6afdd0f4d8 Merge branch 'main' into 'main'
Here update your branch dont forget to send me your merge once u done editing as well

See merge request DogePrime/do-disciplinary-committee-members!2
2025-05-09 22:59:57 +00:00
Maou
6e82aa84ff forgot one ikichi 2025-05-09 23:18:40 +01:00
Maou
16e32038d0 correcting the igi and igishi to Ikishi Suizou it is the same person 2025-05-09 23:15:19 +01:00
Maou
d88c953fa9 Fixing the misnamed npcs from bug report 2025-05-09 22:37:28 +01:00
Wolf
7ab0b290df Merge branch 'main' into 'main'
Main

See merge request Wolf/do-disciplinary-committee-members!1
2025-05-09 16:24:27 +00:00
DogePrime
b5127f9529 Merge branch 'main' into 'main'
This is a test

See merge request DogePrime/do-disciplinary-committee-members!1
2025-05-09 16:14:31 +00:00
DogePrime
be084563a1 Corridor of Dreams fix 2025-05-09 13:51:21 +00:00
DogePrime
b4de7b5e16 Fixing consistency stuff I missed last time 2025-05-09 13:42:53 +00:00
Maou
93bdfc7688 Fixed some newlines and tested them all ingame 2025-05-09 14:27:44 +01:00
Wolf
971b5380e1 Merge branch do-disciplinary-committee-members:main into main 2025-05-09 11:06:25 +00:00
dbe32c6723 l 2025-05-09 01:21:01 -05:00