Merge pull request #241 from HojouFotytu/develop

Develop

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
+#
+#

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
+#
+#

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
+#
+#

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.

PTMagic/_presets/Default/DCA.PROPERTIES

@@ -1,68 +1,5 @@
-# ####################################
-# ####### 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
+#  Copy the contents of your Profit Trailer DCA settings here
 #
-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
 #

PTMagic/_presets/Default/INDICATORS.PROPERTIES

@@ -1,30 +1,5 @@
-# ####################################
-# ####### 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
+#  Copy the contents of your Profit Trailer INDICATORS settings here
 #
-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
 #

PTMagic/_presets/Default/PAIRS.PROPERTIES

@@ -1,67 +1,5 @@
-# ####################################
-# ####### 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
+#  Copy the contents of your Profit Trailer PAIRS settings here
 #
+#

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.