Commit Graph
4593 Commits
Author SHA1 Message Date
Ghost_chu 2f9bb0f022 Poi
Former-commit-id: 4514a67ef8ba14dfbc3967cefc35f71e161bd4a7
2020-08-05 20:08:28 +08:00
sandtechnology 1853944a39 Update for tax account introduction
Former-commit-id: dc0fbe5f497c810bcb4a054b3cfa563f021260ed
2020-08-05 13:15:14 +08:00
sandtechnology 1a762c7616 Merge remote-tracking branch 'origin/master'
Former-commit-id: 7df378f17a6276317b8d64ce6e7c89d7f8bb2a00
2020-08-05 13:10:44 +08:00
sandtechnology 799182ffd5 Allow disabling tax account by set it to empty
Former-commit-id: e710760ba239233f4f021e8fec247085ed589f96
2020-08-05 13:09:44 +08:00
Ghost_chu c9d721a7a7 Merge pull request #532 from Ghost-chu/Ghost-chu-patch-1
Tax never should failed.

Former-commit-id: 50db780a13a8afebad107b8ccb3b10d40b83b10e
2020-08-05 12:24:53 +08:00
Ghost_chu d18d3e3aa4 Tax never should failed.
Former-commit-id: 0d59ec929f5c9050b6f1a60a089368c0693dc2ce
2020-08-05 10:38:05 +08:00
sandtechnology fe931ac444 Merge remote-tracking branch 'origin/master'
Former-commit-id: 08c15e063f60ace9e7fb6e9261295232981f0090
2020-08-05 00:18:49 +08:00
sandtechnology e019a3e13f Ignore tax account deposit when tax is 0
Former-commit-id: a75e0123b63ee814633a33a276830c3a3a6cd0cf
2020-08-04 22:47:41 +08:00
sandtechnology d4d3d91725 Merge pull request #530 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: cfbf731ef675a949e0ddc38e6f68d76eb17dcbe6
2020-08-04 15:39:21 +08:00
sandtechnology 1e402a9e7b 4.0.4.4
Former-commit-id: 0e29dac87ad24220e75ab72dfd1ec44dfbfed945
2020-08-04 15:37:52 +08:00
sandtechnology 2c54a2a581 Fix wrong tax display
Former-commit-id: bb21f3ff7c619b6e539301dd12aaeda1eadeda4e
2020-08-04 15:20:43 +08:00
Ghost_chu 435cc9a6ae New translations messages.json (Dutch)
Former-commit-id: 40e8a56497833018bb2005dd99c379a513c6a765
2020-08-04 14:08:15 +08:00
Ghost_chu 1c5c6e6a85 New translations messages.json (Dutch)
Former-commit-id: 78a54692447e8dbd506be99307d914d8925e5c58
2020-08-04 13:55:15 +08:00
Ghost_chu 0ea4d27b1f New translations messages.json (Dutch)
Former-commit-id: 5b3f5f287c0ee18705c74814d8a7b4643bbc373f
2020-08-04 13:45:03 +08:00
sandtechnology c266e04518 Making code more readable
Former-commit-id: 1279b397673118bb21a138920b11224378940814
2020-08-04 13:21:13 +08:00
sandtechnology 2b9579c25f Delete debug code
Former-commit-id: 0f465e0c883c9ad577d9234bccf2e9911c5860f1
2020-08-04 13:15:42 +08:00
sandtechnology 3c0d0f0f04 4.0.4.3
Former-commit-id: 6539fccc2e154e6fd2749b10c3cfd5720815cf75
2020-08-04 13:13:45 +08:00
sandtechnology 5b1c0ba835 Merge remote-tracking branch 'origin/master'
Former-commit-id: e2501ea5b8cf1d49229d05cdfad8624091766d5d
2020-08-04 13:12:56 +08:00
sandtechnology 8f7a0774cb Fix #528
Former-commit-id: ad43e06c0fcb123cf6337bda9c6d9c4c7172466c
2020-08-04 13:11:50 +08:00
Ghost_chu 95adef407f Remove POM Version from BuildInfo
Former-commit-id: 3e7db1ebe2f60db07109b0475c73be94deeef7b7
2020-08-03 21:55:37 +08:00
sandtechnology 508d6e34c4 Add Null Test
Former-commit-id: b2704492be688f91b14b8549987d502e80cc7f41
2020-08-03 20:22:20 +08:00
sandtechnology 628a878294 commit when close the connection
Former-commit-id: e9e78508f3c091eec0400488a68d2a65f5d5136d
2020-08-03 20:14:15 +08:00
sandtechnology 427afd29be Try to fix shop missing problem
Former-commit-id: 2389865fad7d5d075c280bb0ef78a633ebd66eae
2020-08-03 19:59:33 +08:00
sandtechnology eda7355c68 Improve shop log in qs.log and fix typo, thanks to @Bloodlex
Former-commit-id: 1b4b97e81ac58d9da34802b3938954ca4b489d70
2020-08-03 01:30:55 +08:00
sandtechnology b26e8ebc1c Add Owner balance logging in qs.log
Former-commit-id: 2ad96785ec183c790d065e862c08e51f3923fa6a
2020-08-02 22:38:40 +08:00
sandtechnology b0f09e3c70 Add pre balance logging in qs.log
Former-commit-id: f126ccc375f17834c1ed6264fdc243477e8f7b0d
2020-08-02 14:38:43 +08:00
sandtechnology 6dc3fd1f59 Accept Ghost_chu suggestion, keep logging in qs.log and remove @Nullable
Former-commit-id: 2cefeeae480b855f8362134124e4fb428d2924ea
2020-08-02 14:20:41 +08:00
sandtechnology e5c49a4bca Add EconomyTransaction Test
Former-commit-id: f82eb54bca8a0e4ffc2d1f1762a2dffdfe3d9ae1
2020-08-02 01:06:05 +08:00
sandtechnology 31fe733834 Logged error when EconomyTransaction Failed
Former-commit-id: 09fd01c1e9a2096fdbb3d907ee6c689b7c74fe05
2020-08-02 00:08:28 +08:00
sandtechnology 02cebd4e09 Merge remote-tracking branch 'origin/master'
Former-commit-id: 744df8dd12377cee87f7e6a25be27b95ce94191a
2020-08-01 23:57:22 +08:00
sandtechnology 00b2f4a896 Refactor hasColumn method
Former-commit-id: 09545a81e17ab91b64e21da87c0703d8581891cb
2020-08-01 23:57:03 +08:00
sandtechnology 6ae3559c7f Merge pull request #527 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: f3169f02166342d95fac906b89e1b06d839e256b
2020-08-01 23:36:24 +08:00
Ghost_chu c34773a90d New translations messages.json (Chinese Simplified)
Former-commit-id: 461fb514ae32a919d88bf81a0999d461734b4399
2020-08-01 23:24:45 +08:00
sandtechnology af1b888a15 Merge remote-tracking branch 'origin/master'
Former-commit-id: f6601cecf3af058d407035a3aa6dedc53dddc5ac
2020-08-01 23:05:14 +08:00
sandtechnology 63e8794be6 Optimize economy transaction logic and fix response bug
Former-commit-id: d47d66cd6a068813ed46fdda431e033aadafc6ca
2020-08-01 23:04:29 +08:00
sandtechnology bfaf0c17bb Add Javadoc
Former-commit-id: 81ddf0371e5ea9572dfc390bc9de78d73abc05de
2020-08-01 23:02:19 +08:00
sandtechnology 535993554d Fix control panel displaying issue
Former-commit-id: 84e22872ccb092a0ed4a5123aad4a4aad8f1ce0c
2020-08-01 23:01:38 +08:00
Ghost_chu 3a19d08914 Merge pull request #526 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: d36a304b844714ce21db5c3900c5c4597a27a540
2020-08-01 18:16:47 +08:00
sandtechnology def295c28c Fix control panel issue
Former-commit-id: 5687c10d820963c88385f4bfe66b6da13b0e801e
2020-08-01 18:03:53 +08:00
sandtechnology 359c5b390a Fix javadoc
Former-commit-id: eb883ab4f8660fcd0c980291fc0a689e776d84ad
2020-08-01 16:07:35 +08:00
Ghost_chu f75d4ed1fc New translations messages.json (Korean)
Former-commit-id: 8ae4cb76ad5820e5ca9c453f602fda36da118ac7
2020-08-01 14:33:57 +08:00
Ghost_chu c1cc0822a7 New translations messages.json (Korean)
Former-commit-id: b59210101c2d73b8805ff5e3b5a119fb41391e16
2020-08-01 14:14:14 +08:00
Ghost_chu d47aee35ee New translations messages.json (Korean)
Former-commit-id: dbc6a00dc87005cdd8be3867c39a4f3c403d0e59
2020-08-01 14:04:38 +08:00
sandtechnology 21ad819d4d Revert some changes to make sure change is sync
Former-commit-id: 2cced8217d0c817551e743f728f59afa2dde1327
2020-08-01 03:32:11 +08:00
sandtechnology 06cdbd8f97 Fix wrong tax display
Former-commit-id: 6a0bfa77a56131700ddcc7accc419bf384bfa723
2020-08-01 03:07:44 +08:00
sandtechnology 142a2e69c4 Using BigDecimal
Former-commit-id: 42572ba99b08444fdbe1a0f339edfca3cba68d98
2020-08-01 02:58:52 +08:00
sandtechnology d08e42be4b Fix a serious bug which counting tax wrongly
Former-commit-id: e7a1c7d0810d22c9f8a78a7140460c022787ec52
2020-08-01 02:53:19 +08:00
sandtechnology 3e73055d9b Merge remote-tracking branch 'origin/master'
Former-commit-id: 9ab558d9ef224238a0ef4eb554fc7b61ec93efa5
2020-08-01 01:55:20 +08:00
sandtechnology caddce012e Trying fix balance updating issue
Former-commit-id: 490f7bcff33bf5e25797aac13ed1ee76e747b75c
2020-08-01 01:52:51 +08:00
sandtechnology 811cfdd673 Merge pull request #525 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: 0fc8aa089b7eab4a01de25a1630c8d4e7458ca7c
2020-08-01 01:27:50 +08:00