From e96a5a3077e765dcbe129da8effc31f2ee0cb219 Mon Sep 17 00:00:00 2001
From: simonr <simonr@simonr-All-Series>
Date: Wed, 26 Oct 2016 22:07:54 +0200
Subject: [PATCH] Bugfixing

---
 Xerxes-2016-10-26.zip               | Bin 604 -> 0 bytes
 Xerxes.zip                          | Bin 0 -> 266 bytes
 src/Zipper/AktuellesDatumJava8.java |  29 ----------------------------
 src/Zipper/Zip.java                 |   6 +++---
 src/Zipper/frage.java               |   3 ---
 5 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 Xerxes-2016-10-26.zip
 create mode 100644 Xerxes.zip
 delete mode 100644 src/Zipper/AktuellesDatumJava8.java

diff --git a/Xerxes-2016-10-26.zip b/Xerxes-2016-10-26.zip
deleted file mode 100644
index 655494a7c1181b922fe137bf81c332b66d37e091..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmWIWW@Zs#;9y{22woTE38dhF70AlXPbt<9@MZ_e!$AN}ExbTAU@btxNG~g~h&-)^
z__d~^Ig}k}YjS>GT4p*Pr>3H55=UrC%1MMEJ%}loj%H*MVZa?okbn_@P_Q7wtpyZF
z2w)6kq6HbTTJw;!LW2yU6<Z)dYy~-VB@n}d450~IAVD;N$a@G)m_f$M22#QbgvyKz
IV9dY(0FuW|F#rGn

diff --git a/Xerxes.zip b/Xerxes.zip
new file mode 100644
index 0000000000000000000000000000000000000000..8c885b6d3f0fdcb1e2afa725a6c0acefe5c8a26a
GIT binary patch
literal 266
zcmWIWW@Zs#;9y{2NL?4@38dga9LP$}&r8cp*H6kxgdjbLK!7(pNCzAQzzs=9GlU(e
w25JbVCPpR^2HbYTO$Re@x&&beHoGB)2mmQpAcnhyl?^1p1cX&U8iW}b06d~3ZU6uP

literal 0
HcmV?d00001

diff --git a/src/Zipper/AktuellesDatumJava8.java b/src/Zipper/AktuellesDatumJava8.java
deleted file mode 100644
index 711612b..0000000
--- a/src/Zipper/AktuellesDatumJava8.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package Zipper;
-
-/**
- *
- * @author simonr
- */
-import Zipper.Zip;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-public class AktuellesDatumJava8 {
-
-    static void formatDateTime() {
-        LocalDateTime now = LocalDateTime.now();
-        DateTimeFormatter df;
-        df = DateTimeFormatter.ISO_LOCAL_DATE;    // 2016-18-31 
-        System.out.println(now.format(df));
-        Zip.datum = now.format(df);
-    }
-
-    public static void main(String[] args) {
-        formatDateTime();
-    }
-}
diff --git a/src/Zipper/Zip.java b/src/Zipper/Zip.java
index f1ce138..e46cbc2 100644
--- a/src/Zipper/Zip.java
+++ b/src/Zipper/Zip.java
@@ -22,10 +22,10 @@ public class Zip {
         try {
 
             // Initiate ZipFile object with the path/name of the zip file.
-            ZipFile zipFile = new ZipFile(modpack + "-" + datum +  ".zip");
+            ZipFile zipFile = new ZipFile(modpack + ".zip");
 
             // Folder to add
-            String folderToAdd = "./modpack/modpack/";
+            String folderToAdd = "./modpack/modpack/config";
 
             // Initiate Zip Parameters which define various properties such
             // as compression method, etc.
@@ -38,7 +38,7 @@ public class Zip {
             parameters.setCompressionLevel(Zip4jConstants.DEFLATE_LEVEL_NORMAL);
             
             // Set the root folder
-            parameters.setIncludeRootFolder(false);
+            //parameters.setIncludeRootFolder(false);
 
             // Add folder to the zip file
             zipFile.addFolder(folderToAdd, parameters);
diff --git a/src/Zipper/frage.java b/src/Zipper/frage.java
index af9fc47..40dde93 100644
--- a/src/Zipper/frage.java
+++ b/src/Zipper/frage.java
@@ -5,8 +5,6 @@
  */
 package Zipper;
 
-import Zipper.AktuellesDatumJava8;
-import Zipper.Zip;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -82,7 +80,6 @@ public class frage extends javax.swing.JFrame {
         // TODO add your handling code here:
         String name = jTextField1.getText();
         System.out.println(name);
-        AktuellesDatumJava8.main(null);
         Zip a = new Zip();
         a.modpack = name;
         a.archiveDir(null);