From 54fb1cea65f802738d97ad2b39e9dec94b2d1d31 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Tue, 2 Feb 2021 12:51:43 +0900 Subject: [PATCH 1/3] remove folder spaces & PT settings --- .../Monitor/appsettings.json | 0 .../nlog.config | 0 .../settings.analyzer.json | 0 .../settings.general.json | 0 PTMagic/_presets/Default/DCA.PROPERTIES | 68 ------------------- .../_presets/Default/INDICATORS.PROPERTIES | 30 -------- PTMagic/_presets/Default/PAIRS.PROPERTIES | 67 ------------------ 7 files changed, 165 deletions(-) rename PTMagic/_defaults/{_default settings PT 2.x => _default_settings_PT_2.x}/Monitor/appsettings.json (100%) rename PTMagic/_defaults/{_default settings PT 2.x => _default_settings_PT_2.x}/nlog.config (100%) rename PTMagic/_defaults/{_default settings PT 2.x => _default_settings_PT_2.x}/settings.analyzer.json (100%) rename PTMagic/_defaults/{_default settings PT 2.x => _default_settings_PT_2.x}/settings.general.json (100%) delete mode 100644 PTMagic/_presets/Default/DCA.PROPERTIES delete mode 100644 PTMagic/_presets/Default/INDICATORS.PROPERTIES delete mode 100644 PTMagic/_presets/Default/PAIRS.PROPERTIES diff --git a/PTMagic/_defaults/_default settings PT 2.x/Monitor/appsettings.json b/PTMagic/_defaults/_default_settings_PT_2.x/Monitor/appsettings.json similarity index 100% rename from PTMagic/_defaults/_default settings PT 2.x/Monitor/appsettings.json rename to PTMagic/_defaults/_default_settings_PT_2.x/Monitor/appsettings.json diff --git a/PTMagic/_defaults/_default settings PT 2.x/nlog.config b/PTMagic/_defaults/_default_settings_PT_2.x/nlog.config similarity index 100% rename from PTMagic/_defaults/_default settings PT 2.x/nlog.config rename to PTMagic/_defaults/_default_settings_PT_2.x/nlog.config diff --git a/PTMagic/_defaults/_default settings PT 2.x/settings.analyzer.json b/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json similarity index 100% rename from PTMagic/_defaults/_default settings PT 2.x/settings.analyzer.json rename to PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json diff --git a/PTMagic/_defaults/_default settings PT 2.x/settings.general.json b/PTMagic/_defaults/_default_settings_PT_2.x/settings.general.json similarity index 100% rename from PTMagic/_defaults/_default settings PT 2.x/settings.general.json rename to PTMagic/_defaults/_default_settings_PT_2.x/settings.general.json diff --git a/PTMagic/_presets/Default/DCA.PROPERTIES b/PTMagic/_presets/Default/DCA.PROPERTIES deleted file mode 100644 index 7fac35f..0000000 --- a/PTMagic/_presets/Default/DCA.PROPERTIES +++ /dev/null @@ -1,68 +0,0 @@ -# #################################### -# ####### PTMagic Current Setting ######## -# PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 3/26/2018 11:52 AM -# #################################### -# -DCA_keep_balance = 0 -DCA_keep_balance_percentage = 0 -# -DEFAULT_DCA_max_cost = 0 -DEFAULT_DCA_max_buy_times = 20 -# -DEFAULT_DCA_A_buy_strategy = LOWBB -DEFAULT_DCA_A_buy_value = 5 -DEFAULT_DCA_A_buy_value_limit = -2.5 -# -DEFAULT_DCA_B_buy_strategy = RSI -DEFAULT_DCA_B_buy_value = 33 -DEFAULT_DCA_B_buy_value_limit = 5 -# -DEFAULT_DCA_trailing_buy = 0 -# -DEFAULT_DCA_buy_trigger = 0 -# -DEFAULT_DCA_buy_percentage_1 = 100 -DEFAULT_DCA_buy_percentage_2 = 50 -DEFAULT_DCA_buy_percentage_3 = 50 -DEFAULT_DCA_buy_percentage_4 = 25 -DEFAULT_DCA_buy_percentage_5 = 30 -DEFAULT_DCA_buy_percentage_6 = 25 -DEFAULT_DCA_buy_percentage_7 = 20 -DEFAULT_DCA_buy_percentage_8 = 15.5 -DEFAULT_DCA_buy_percentage_9 = 12.11 -DEFAULT_DCA_buy_percentage_10 = 10 -DEFAULT_DCA_buy_percentage_11 = 8 -DEFAULT_DCA_buy_percentage_12 = 7 -DEFAULT_DCA_buy_percentage_13 = 6 -DEFAULT_DCA_buy_percentage_14 = 6 -DEFAULT_DCA_buy_percentage_15 = 5 -DEFAULT_DCA_buy_percentage_16 = 5 -DEFAULT_DCA_buy_percentage_17 = 5 -DEFAULT_DCA_buy_percentage_18 = 5 -DEFAULT_DCA_buy_percentage_19 = 5 -DEFAULT_DCA_buy_percentage_20 = 5 -# -DEFAULT_DCA_A_sell_strategy = GAIN -DEFAULT_DCA_A_sell_value = 1 -# -DEFAULT_DCA_B_sell_strategy = RSI -DEFAULT_DCA_B_sell_value = 40 -# -DEFAULT_DCA_trailing_profit = 0.147 -DEFAULT_DCA_max_profit = 0 -# -DEFAULT_DCA_min_order_book_volume_percentage = 100 -# -DEFAULT_DCA_ignore_sell_only_mode = true -# -DEFAULT_DCA_max_buy_spread = 2 -DEFAULT_DCA_rebuy_timeout = 10 -# -DEFAULT_DCA_stop_loss_trigger = 0 -DEFAULT_DCA_stop_loss_timeout = 0 -DEFAULT_DCA_pending_order_wait_time = 0 -# -DEFAULT_DCA_buy_min_price_increase = 0 -DEFAULT_DCA_buy_max_price_increase = 0 -# \ No newline at end of file diff --git a/PTMagic/_presets/Default/INDICATORS.PROPERTIES b/PTMagic/_presets/Default/INDICATORS.PROPERTIES deleted file mode 100644 index a6ecba4..0000000 --- a/PTMagic/_presets/Default/INDICATORS.PROPERTIES +++ /dev/null @@ -1,30 +0,0 @@ -# #################################### -# ####### PTMagic Current Setting ######## -# PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 3/26/2018 11:52 AM -# #################################### -# -BB_std = 2 -BB_candle_period = 300 -BB_length = 20 -# -SMA_cross_candles = 2 -SMA_candle_period = 300 -SMA_fast_length = 12 -SMA_slow_length = 24 -# -EMA_cross_candles = 3 -EMA_candle_period = 300 -EMA_fast_length = 3 -EMA_slow_length = 24 -# -RSI_candle_period = 300 -RSI_length = 14 -# -STOCH_length = 14 -# -MACD_candle_period = 300 -MACD_fast_length = 12 -MACD_slow_length = 26 -MACD_signal = 9 -# \ No newline at end of file diff --git a/PTMagic/_presets/Default/PAIRS.PROPERTIES b/PTMagic/_presets/Default/PAIRS.PROPERTIES deleted file mode 100644 index 35670dc..0000000 --- a/PTMagic/_presets/Default/PAIRS.PROPERTIES +++ /dev/null @@ -1,67 +0,0 @@ -# #################################### -# ####### PTMagic Current Setting ######## -# PTMagic_ActiveSetting = Default -# PTMagic_LastChanged = 23.05.2018 07:29 -# #################################### - - -# -market = USDT -# -start_balance = 1105.17429444 -USDT_dust = 3.50 -# -enabled_pairs = ADA, BCC, BTC, BTG, ETH, LTC, NEO, OMG, XMR, XRP, ZEC -hidden_pairs = ALL -# -max_trading_pairs = 5 -# -keep_balance = 0 -keep_balance_percentage = 0 -# -consecutive_buy_trigger = 0 -consecutive_sell_trigger = 0 -# -DEFAULT_trading_enabled = true -DEFAULT_sell_only_mode_enabled = true -# -pair_min_listed_days = 14 -DEFAULT_DCA_enabled = true -# -DEFAULT_initial_cost = 10 -DEFAULT_initial_cost_percentage = 0 -DEFAULT_min_buy_volume = 300000 -DEFAULT_min_buy_price = 0 -DEFAULT_max_buy_spread = 1 -DEFAULT_min_order_book_volume_percentage = 100 -# -DEFAULT_A_buy_strategy = LOWBB -DEFAULT_A_buy_value = 5 -DEFAULT_A_buy_value_limit = -2.5 -# -DEFAULT_B_buy_strategy = RSI -DEFAULT_B_buy_value = 33 -DEFAULT_B_buy_value_limit = 0 -# -DEFAULT_trailing_buy = 0 -# -DEFAULT_A_sell_strategy = GAIN -DEFAULT_A_sell_value = 1 -# -DEFAULT_B_sell_strategy = RSI -DEFAULT_B_sell_value = 40 -# -DEFAULT_trailing_profit = 0.16 -DEFAULT_max_profit = 0 -# -DEFAULT_stop_loss_trigger = 0 -DEFAULT_stop_loss_timeout = 0 -DEFAULT_panic_sell_enabled = false -DEFAULT_rebuy_timeout = 5 -# -DEFAULT_buy_min_price_increase = 0 -DEFAULT_buy_max_price_increase = 0 -# -DEFAULT_pending_order_wait_time = 0 -DEFAULT_combined_cancel_pending_trigger = 0 -# From c46393d6bcb44f4d3ac37398dc47793c5a23c476 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Tue, 2 Feb 2021 13:00:58 +0900 Subject: [PATCH 2/3] added Default folder readme --- .../_default_settings_PT_2.x/_presets/Default/READ_ME.txt | 4 ++++ PTMagic/_presets/Default/READ_ME.txt | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/READ_ME.txt create mode 100644 PTMagic/_presets/Default/READ_ME.txt diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/READ_ME.txt b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/READ_ME.txt new file mode 100644 index 0000000..4477c4d --- /dev/null +++ b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/READ_ME.txt @@ -0,0 +1,4 @@ + +PTMagic requires at least one settings folder named "Default" to function properly. Please copy your current settings files from Profit Trailer to this folder. + +See the Setup Guide on the PTMagic wiki for more information. \ No newline at end of file diff --git a/PTMagic/_presets/Default/READ_ME.txt b/PTMagic/_presets/Default/READ_ME.txt new file mode 100644 index 0000000..4477c4d --- /dev/null +++ b/PTMagic/_presets/Default/READ_ME.txt @@ -0,0 +1,4 @@ + +PTMagic requires at least one settings folder named "Default" to function properly. Please copy your current settings files from Profit Trailer to this folder. + +See the Setup Guide on the PTMagic wiki for more information. \ No newline at end of file From 9c8d686596c267f385b3207381c3b60db66d3a8e Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Tue, 2 Feb 2021 13:21:45 +0900 Subject: [PATCH 3/3] placeholder settings --- .../_default_settings_PT_2.x/_presets/Default/DCA.PROPERTIES | 5 +++++ .../_presets/Default/INDICATORS.PROPERTIES | 5 +++++ .../_presets/Default/PAIRS.PROPERTIES | 5 +++++ PTMagic/_presets/Default/DCA.PROPERTIES | 5 +++++ PTMagic/_presets/Default/INDICATORS.PROPERTIES | 5 +++++ PTMagic/_presets/Default/PAIRS.PROPERTIES | 5 +++++ 6 files changed, 30 insertions(+) create mode 100644 PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/DCA.PROPERTIES create mode 100644 PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/INDICATORS.PROPERTIES create mode 100644 PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/PAIRS.PROPERTIES create mode 100644 PTMagic/_presets/Default/DCA.PROPERTIES create mode 100644 PTMagic/_presets/Default/INDICATORS.PROPERTIES create mode 100644 PTMagic/_presets/Default/PAIRS.PROPERTIES diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/DCA.PROPERTIES b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/DCA.PROPERTIES new file mode 100644 index 0000000..b13d0b4 --- /dev/null +++ b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/DCA.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer DCA settings here +# +# \ No newline at end of file diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/INDICATORS.PROPERTIES b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/INDICATORS.PROPERTIES new file mode 100644 index 0000000..d5d401e --- /dev/null +++ b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/INDICATORS.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer INDICATORS settings here +# +# \ No newline at end of file diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/PAIRS.PROPERTIES b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/PAIRS.PROPERTIES new file mode 100644 index 0000000..4df6d53 --- /dev/null +++ b/PTMagic/_defaults/_default_settings_PT_2.x/_presets/Default/PAIRS.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer PAIRS settings here +# +# \ No newline at end of file diff --git a/PTMagic/_presets/Default/DCA.PROPERTIES b/PTMagic/_presets/Default/DCA.PROPERTIES new file mode 100644 index 0000000..b13d0b4 --- /dev/null +++ b/PTMagic/_presets/Default/DCA.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer DCA settings here +# +# \ No newline at end of file diff --git a/PTMagic/_presets/Default/INDICATORS.PROPERTIES b/PTMagic/_presets/Default/INDICATORS.PROPERTIES new file mode 100644 index 0000000..d5d401e --- /dev/null +++ b/PTMagic/_presets/Default/INDICATORS.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer INDICATORS settings here +# +# \ No newline at end of file diff --git a/PTMagic/_presets/Default/PAIRS.PROPERTIES b/PTMagic/_presets/Default/PAIRS.PROPERTIES new file mode 100644 index 0000000..4df6d53 --- /dev/null +++ b/PTMagic/_presets/Default/PAIRS.PROPERTIES @@ -0,0 +1,5 @@ +# +# +# Copy the contents of your Profit Trailer PAIRS settings here +# +# \ No newline at end of file