Commit graph

377 commits

Author SHA1 Message Date
dazedanon
616f334666
Merge pull request #28 from eromangaka/upstream2
Random fixes as I come across things
2023-07-19 16:17:31 -05:00
Ero Manga Sensei
78213a08bb
Merge pull request #17 from DazedMTL/main
Merge upstream
2023-07-19 16:56:42 -04:00
eromangaka
2f54cb40fd Fixing broken SNR 2023-07-19 16:42:55 -04:00
eromangaka
431876a756 Random fixes as I come across things 2023-07-19 16:32:21 -04:00
d81fae73cc Cleanup skills.json a bit 2023-07-19 15:12:09 -05:00
af0cf8be6e Fix some skills and objectives 2023-07-19 14:41:40 -05:00
095a0c40d5 Small Type and formatting fix 2023-07-19 14:31:47 -05:00
59ea9b9d91 Fix secrete diary and make stats consistent 2023-07-19 14:02:44 -05:00
f80beb15d3 Remove Location: to avoid text clipping 2023-07-19 13:36:31 -05:00
21aa77dc5c Edit map descriptions 2023-07-19 13:29:38 -05:00
90c1b9a5c9 Missed one 2023-07-19 13:13:14 -05:00
f2e57e61e0 Shorten some location names 2023-07-19 13:11:13 -05:00
fac3455ce8 Translate lottery items 2023-07-19 13:05:31 -05:00
ef40b3eda9 Merge branch 'main' of https://github.com/DazedMTL/RJ01043101 2023-07-19 12:42:12 -05:00
22acbc50eb Formatting fix donations 2023-07-19 12:42:09 -05:00
dazedanon
b4b42b3201
Merge pull request #27 from eromangaka/upstream2
Restore layout changes post-1.0.3 patch process
2023-07-19 12:27:29 -05:00
2e1d492d4a Put feesh in correct folder 2023-07-19 12:23:25 -05:00
eromangaka
9f56810072 Changes to kanae 80 affection scene 2023-07-19 13:05:07 -04:00
65f7f391b4 Patch 1.0.3c 2023-07-19 11:30:45 -05:00
Ero Manga Sensei
83ccbab4df
Merge branch 'DazedMTL:main' into upstream2 2023-07-19 12:01:37 -04:00
Ero Manga Sensei
963731928a
Merge pull request #16 from eromangaka/upstreamMerge
Fixing re-translation positioning
2023-07-19 11:57:05 -04:00
eromangaka
31e2f90a99 Fixing re-translation positioning 2023-07-19 11:55:14 -04:00
dazedanon
2446b961bf
Merge pull request #26 from eromangaka/upstream2
More text fixes, mostly for "begging" scenes
2023-07-19 10:29:45 -05:00
dazedanon
0d2dc9577a
Merge pull request #24 from shionels/main
Swap favorability / likability to affection
2023-07-19 10:18:56 -05:00
dazedanon
e3e20c06ac
Merge pull request #25 from CamiKaa/main
Panties descriptions changes
2023-07-19 10:14:42 -05:00
eromangaka
46810dc8cd Missed these changes somehow 2023-07-19 04:28:08 -04:00
eromangaka
d8a03a60f0 Even more 2023-07-19 02:20:28 -04:00
CamiKaa
798d03a43a Panties descriptions changes 2023-07-19 03:18:12 -03:00
shionels
3f5a6c03ca minor spell fixes 2023-07-19 12:23:51 +07:00
shionels
611cf611ef fix spelling
based on dazed's feedback
2023-07-19 11:52:34 +07:00
shionels
85c76be786
Merge branch 'main' into main 2023-07-19 11:26:53 +07:00
eromangaka
2042d73586 Merge branch 'upstream2' of https://github.com/eromangaka/RJ01043101 into upstream2 2023-07-19 00:26:35 -04:00
eromangaka
03f050df2e more 2023-07-19 00:26:32 -04:00
eromangaka
84520555fa more begging 2023-07-19 00:17:17 -04:00
Ero Manga Sensei
df560bbeac
Merge branch 'DazedMTL:main' into upstream2 2023-07-19 00:15:46 -04:00
dazedanon
a64c84c33f
Merge pull request #20 from eromangaka/upstream
Begging Scene Translation fixes
2023-07-18 22:55:48 -05:00
dazedanon
7d6449cabe
Merge pull request #23 from CamiKaa/main
Item Tab description changes
2023-07-18 22:54:00 -05:00
CamiKaa
23b2f2692a
Merge branch 'main' into main 2023-07-19 00:46:33 -03:00
eromangaka
ddde58efb4 Fix begging scenes for shizuku 2023-07-18 23:33:44 -04:00
shionels
d90f3656a4 adjust affection notification message 2023-07-19 10:28:40 +07:00
CamiKaa
0202302cd8 Item Tab description changes 2023-07-19 00:20:42 -03:00
shionels
647c4f40cd Swap favorability / likability to affection
- Swap favorability / likability to affection, for consistency and following the first game
- add manual translation for akari 40 and 60 aff event
2023-07-19 10:16:16 +07:00
eromangaka
2762a6bec9 Merge branch 'upstream2' of https://github.com/eromangaka/RJ01043101 into upstream2 2023-07-18 22:27:53 -04:00
eromangaka
aea964706b Fixes suzuka begging scenes 2023-07-18 22:27:44 -04:00
606b632ffa Consistency items 2023-07-18 20:54:10 -05:00
0116aa69f2 Fix Pantie category 2023-07-18 20:51:25 -05:00
17216ecbe6 Fix the feesh 2023-07-18 20:35:52 -05:00
912c9b9f02 Revert "Revert "Translate feesh""
This reverts commit f93b8232f1.
2023-07-18 20:10:54 -05:00
Ero Manga Sensei
f66394d8ca
Merge branch 'DazedMTL:main' into master 2023-07-18 21:08:45 -04:00
eromangaka
40fc76ac11 Merge branch 'heads/upstream' 2023-07-18 21:05:35 -04:00