Commit graph

377 commits

Author SHA1 Message Date
Ero Manga Sensei
16cd963a19
Merge branch 'DazedMTL:main' into upstream 2023-07-18 20:57:00 -04:00
f93b8232f1 Revert "Translate feesh"
This reverts commit 9abbc1b882.
2023-07-18 19:53:11 -05:00
Ero Manga Sensei
de571f64fe
Merge branch 'DazedMTL:main' into upstream 2023-07-18 20:39:18 -04:00
dazedanon
e9b20ecc5d
Merge pull request #21 from CamiKaa/main
Initial Items descriptions changes
2023-07-18 19:12:05 -05:00
CamiKaa
658c9144ee Initial Items descriptions changes 2023-07-18 21:06:29 -03:00
2eab08c8fa Mentaiko > Mentai; Also capitalize all instances 2023-07-18 19:05:41 -05:00
eromangaka
f1f680a291 Not sure how these got missed 2023-07-18 20:03:55 -04:00
eromangaka
781f755a59 Revert "Revert rewrite changes"
This reverts commit 5f0f9e5fe0.
2023-07-18 19:56:40 -04:00
Ero Manga Sensei
604936503e
Merge branch 'DazedMTL:main' into merge1 2023-07-18 19:47:31 -04:00
Ero Manga Sensei
fe0a8ff420
Merge branch 'DazedMTL:main' into master 2023-07-18 19:46:26 -04:00
eromangaka
d1a0396196 Merge branch 'main' 2023-07-18 19:45:53 -04:00
b378ec8c6f Translate Victory Status 2023-07-18 18:35:21 -05:00
Ero Manga Sensei
f308feaa4e
Merge branch 'DazedMTL:main' into merge1 2023-07-18 19:32:38 -04:00
eromangaka
a7ecf7a60a Merge branch 'merge1' of https://github.com/eromangaka/RJ01043101 into merge1 2023-07-18 19:31:13 -04:00
eromangaka
5d15deac51 Fixing more begging scenes, up to Mizuki are all complete, all veriations. Suzuka and onward are next. 2023-07-18 19:31:01 -04:00
5001649b3b Make locations consistent 2023-07-18 18:24:41 -05:00
d80147eb00 Cleanup achievements 2023-07-18 18:03:32 -05:00
Ero Manga Sensei
76947102c2
Merge branch 'DazedMTL:main' into merge1 2023-07-18 18:15:19 -04:00
9abbc1b882 Translate feesh 2023-07-18 17:02:19 -05:00
9043c16a2e Shorten Achievement string 2023-07-18 16:59:00 -05:00
eb8ed73ce1 Cleared > Conquered 2023-07-18 16:25:37 -05:00
eromangaka
b0867c335e Merge branch 'main' into merge1 2023-07-18 17:04:18 -04:00
ae1350370d Fix issue with Menkai coins not working 2023-07-18 15:25:17 -05:00
eromangaka
a5fe79d923 Merge branch 'main' into merge1 2023-07-18 16:13:50 -04:00
Ero Manga Sensei
1f05856618
Merge branch 'DazedMTL:main' into master 2023-07-18 16:06:23 -04:00
eromangaka
051935d0a7 Fixes akari begging scenes 2023-07-18 16:05:18 -04:00
db18ba92bd Fix spacing on days and fix enemies 2023-07-18 14:50:34 -05:00
4dc0af1b2e Translate statuses 2023-07-18 14:11:32 -05:00
bdcda4596f unblip: Translate more pictures 2023-07-18 13:47:57 -05:00
1db66bf38f Change date format back 2023-07-18 13:15:30 -05:00
212c3f8cae Fix dates 2023-07-18 13:13:14 -05:00
eromangaka
cddc66385f More updates to begging scenes 2023-07-18 14:04:50 -04:00
8caebbba4b Retranslate stuff from patch 2023-07-18 13:03:51 -05:00
0589e3f272 Fix wrong name issue 2023-07-18 12:04:01 -05:00
c1c8771475 Patch 1.0.3b 2023-07-18 11:34:05 -05:00
eromangaka
5f0f9e5fe0 Revert rewrite changes 2023-07-18 12:21:30 -04:00
Ero Manga Sensei
68530be665
Merge branch 'DazedMTL:main' into master 2023-07-18 12:11:34 -04:00
33ad6fcee8 Fix subject in bathroom underwear scene 2023-07-18 11:05:53 -05:00
f8f1fa0dbf Translate 2 missing times 2023-07-18 10:42:31 -05:00
dcde50f353 Fix spacing for line 2023-07-18 10:37:28 -05:00
d7ac688103 Translate Var 1142 which are names 2023-07-18 10:36:32 -05:00
d59aeed5c5 Max Favorability consistency 2023-07-18 10:26:38 -05:00
dazedanon
eefac8d148
Merge pull request #15 from shionels/main
Fix menko npc and add manual translation for Akari route
2023-07-18 10:22:37 -05:00
1be2a3c4cc Merge branch 'main' of https://github.com/DazedMTL/RJ01043101 2023-07-18 10:18:17 -05:00
305477fa11 Translate titles and Hikari's name 2023-07-18 10:18:14 -05:00
dazedanon
3bb1f312c4
Merge pull request #18 from eromangaka/mergebranch
Translation fixes and Kanae "husband" scene
2023-07-18 10:11:51 -05:00
Ero Manga Sensei
d771e61122
Merge branch 'DazedMTL:main' into mergebranch 2023-07-18 11:05:04 -04:00
f19bde5a51 unblip: Translate more pictures 2023-07-18 09:48:12 -05:00
shionels
4fe3a30d9e clean up messy merge 2023-07-18 15:59:01 +07:00
shionels
c4e88403ad Merge remote-tracking branch 'origin/main' into main 2023-07-18 15:24:36 +07:00