From 78c8b2ce4dea181da198a7c67ff2a3654a50e5a3 Mon Sep 17 00:00:00 2001 From: Dorian VELOSO Date: Wed, 10 Apr 2024 15:16:33 +0200 Subject: [PATCH 1/3] fix init --- {src/ressources => ressources}/Agents/flock.csv | 0 {src/ressources => ressources}/Rule/BlobRule.csv | 0 {src/ressources => ressources}/Rule/ConwayRule.csv | 0 {src/ressources => ressources}/World/backRake.csv | 0 {src/ressources => ressources}/World/glider.csv | 0 {src/ressources => ressources}/World/gliderTrain.csv | 0 {src/ressources => ressources}/World/gosperGliderGun.csv | 0 {src/ressources => ressources}/World/r_pento.csv | 0 {src/ressources => ressources}/World/stable.csv | 0 src/{src => }/Main.java | 0 src/{src => }/backend/Agent.java | 0 src/{src => }/backend/Sheep.java | 0 src/{src => }/backend/Simulator.java | 0 src/{src => }/windowInterface/JPanelDraw.java | 0 src/{src => }/windowInterface/MyInterface.java | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename {src/ressources => ressources}/Agents/flock.csv (100%) rename {src/ressources => ressources}/Rule/BlobRule.csv (100%) rename {src/ressources => ressources}/Rule/ConwayRule.csv (100%) rename {src/ressources => ressources}/World/backRake.csv (100%) rename {src/ressources => ressources}/World/glider.csv (100%) rename {src/ressources => ressources}/World/gliderTrain.csv (100%) rename {src/ressources => ressources}/World/gosperGliderGun.csv (100%) rename {src/ressources => ressources}/World/r_pento.csv (100%) rename {src/ressources => ressources}/World/stable.csv (100%) rename src/{src => }/Main.java (100%) rename src/{src => }/backend/Agent.java (100%) rename src/{src => }/backend/Sheep.java (100%) rename src/{src => }/backend/Simulator.java (100%) rename src/{src => }/windowInterface/JPanelDraw.java (100%) rename src/{src => }/windowInterface/MyInterface.java (100%) diff --git a/src/ressources/Agents/flock.csv b/ressources/Agents/flock.csv similarity index 100% rename from src/ressources/Agents/flock.csv rename to ressources/Agents/flock.csv diff --git a/src/ressources/Rule/BlobRule.csv b/ressources/Rule/BlobRule.csv similarity index 100% rename from src/ressources/Rule/BlobRule.csv rename to ressources/Rule/BlobRule.csv diff --git a/src/ressources/Rule/ConwayRule.csv b/ressources/Rule/ConwayRule.csv similarity index 100% rename from src/ressources/Rule/ConwayRule.csv rename to ressources/Rule/ConwayRule.csv diff --git a/src/ressources/World/backRake.csv b/ressources/World/backRake.csv similarity index 100% rename from src/ressources/World/backRake.csv rename to ressources/World/backRake.csv diff --git a/src/ressources/World/glider.csv b/ressources/World/glider.csv similarity index 100% rename from src/ressources/World/glider.csv rename to ressources/World/glider.csv diff --git a/src/ressources/World/gliderTrain.csv b/ressources/World/gliderTrain.csv similarity index 100% rename from src/ressources/World/gliderTrain.csv rename to ressources/World/gliderTrain.csv diff --git a/src/ressources/World/gosperGliderGun.csv b/ressources/World/gosperGliderGun.csv similarity index 100% rename from src/ressources/World/gosperGliderGun.csv rename to ressources/World/gosperGliderGun.csv diff --git a/src/ressources/World/r_pento.csv b/ressources/World/r_pento.csv similarity index 100% rename from src/ressources/World/r_pento.csv rename to ressources/World/r_pento.csv diff --git a/src/ressources/World/stable.csv b/ressources/World/stable.csv similarity index 100% rename from src/ressources/World/stable.csv rename to ressources/World/stable.csv diff --git a/src/src/Main.java b/src/Main.java similarity index 100% rename from src/src/Main.java rename to src/Main.java diff --git a/src/src/backend/Agent.java b/src/backend/Agent.java similarity index 100% rename from src/src/backend/Agent.java rename to src/backend/Agent.java diff --git a/src/src/backend/Sheep.java b/src/backend/Sheep.java similarity index 100% rename from src/src/backend/Sheep.java rename to src/backend/Sheep.java diff --git a/src/src/backend/Simulator.java b/src/backend/Simulator.java similarity index 100% rename from src/src/backend/Simulator.java rename to src/backend/Simulator.java diff --git a/src/src/windowInterface/JPanelDraw.java b/src/windowInterface/JPanelDraw.java similarity index 100% rename from src/src/windowInterface/JPanelDraw.java rename to src/windowInterface/JPanelDraw.java diff --git a/src/src/windowInterface/MyInterface.java b/src/windowInterface/MyInterface.java similarity index 100% rename from src/src/windowInterface/MyInterface.java rename to src/windowInterface/MyInterface.java From dcc743696159c05c3e22b43172c44d4631466463 Mon Sep 17 00:00:00 2001 From: FELIPE BERMEJO Date: Wed, 10 Apr 2024 15:21:26 +0200 Subject: [PATCH 2/3] Test from Felipe's computer --- dorian.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dorian.txt diff --git a/dorian.txt b/dorian.txt new file mode 100644 index 0000000..e69de29 From 6a6ac1ba19745ced211ecd714290f23502e81ada Mon Sep 17 00:00:00 2001 From: Dorian VELOSO Date: Wed, 10 Apr 2024 15:24:10 +0200 Subject: [PATCH 3/3] Try of push/pull --- src/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Main.java b/src/Main.java index 46ac7f7..439d0a0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -8,5 +8,6 @@ public class Main { MyInterface mjf = new MyInterface(); mjf.setVisible(true); } + // comment for pull/push trial }