diff --git a/.vim/.netrwhist b/.vim/.netrwhist
index 5839f0c..6e7086e 100644
--- a/.vim/.netrwhist
+++ b/.vim/.netrwhist
@@ -1,7 +1,7 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =5
-let g:netrw_dirhist_1='/Users/brbuller/Development/Work/Fliphound/MobileApp'
-let g:netrw_dirhist_2='/Users/brbuller/Development/Work/Fliphound/MobileApp/app'
-let g:netrw_dirhist_3='/Users/brbuller/Development/Work/Fliphound/MobileApp/app/src'
-let g:netrw_dirhist_4='/Users/brbuller/Development/Work/Fliphound/MobileApp/app/src/main'
-let g:netrw_dirhist_5='/Users/brbuller/Development/Work/High Touch/Enertech/capture'
+let g:netrw_dirhist_1='/Users/brbuller/Development/android/projects/IronGolem/app/src/main/java/com'
+let g:netrw_dirhist_2='/Users/brbuller/Development/android/projects/IronGolem/app/src/main/java/com/bullercodeworks'
+let g:netrw_dirhist_3='/Users/brbuller/Development/android/projects/IronGolem/app/src/main/java/com/bullercodeworks/minecraftmonitor'
+let g:netrw_dirhist_4='/Users/brbuller/Development/android/projects/IronGolem/app/src/main/java/com/bullercodeworks/minecraftmonitor/objs'
+let g:netrw_dirhist_5='/Users/brbuller/Development/nodejs/flashtest'
diff --git a/.vim/vimwiki/vimwiki/Programming.wiki b/.vim/vimwiki/vimwiki/Programming.wiki
index 52536c4..abaff14 100644
--- a/.vim/vimwiki/vimwiki/Programming.wiki
+++ b/.vim/vimwiki/vimwiki/Programming.wiki
@@ -7,6 +7,9 @@ If no credentials, use https clone:
`$HOME/.homesick/repos/homeshick/bin/homeshick clone https://brbuller@bitbucket.org/brbuller/dotfiles.git`
`$HOME/.homesick/repos/homeshick/bin/homeshick clone https://brbuller@bitbucket.org/brbuller/vim-castle.git`
+== Projects ==
+* [[development_projects_irongolem|IronGolem]]
+
* Platforms
- [[Android]]
diff --git a/.vim/vimwiki/vimwiki/Redemption.wiki b/.vim/vimwiki/vimwiki/Redemption.wiki
index eac6b80..383efdf 100644
--- a/.vim/vimwiki/vimwiki/Redemption.wiki
+++ b/.vim/vimwiki/vimwiki/Redemption.wiki
@@ -10,11 +10,12 @@
* [[bible_esv_mark|Mark]]
==== Laptop Software ====
-Spotify
+#Dropbox
+#Spotify
[[http://www.remoteless.no/spotify/index.html|Remoteless Helper (Spotify)]]
GarageBand
-ProPresenter 5
-Google Chrome
+#ProPresenter 5
+#Google Chrome
Keynote
-[[http://roland.com/support/article/?q=downloads&p=UA-11|Duo-Capture Driver]]
+#[[http://roland.com/support/article/?q=downloads&p=UA-11|Duo-Capture Driver]]
diff --git a/.vim/vimwiki/vimwiki/development_projects_irongolem.wiki b/.vim/vimwiki/vimwiki/development_projects_irongolem.wiki
new file mode 100644
index 0000000..3f465c3
--- /dev/null
+++ b/.vim/vimwiki/vimwiki/development_projects_irongolem.wiki
@@ -0,0 +1,14 @@
+Hold:
+
+[
+ {"player":"mrmac131"},
+ {"player":"anhalga"},
+ {"player":"shellsmith"},
+ {"server":
+ {
+ "name":"yogs","url":"http:\/\/minecraft.br0xen.com:8123","type":"dynmap","custom":{"dynmap-version":"1.9.4-1940","dynmap-urls":{"markers":"tiles\/","update":"up\/world\/{world}\/{timestamp}","register":"up\/register","configuration":"up\/configuration","tiles":"tiles\/","login":"up\/login","sendmessage":"up\/sendmessage"},"dynmap-servertime":7981,"dynmap-hasstorm":false,"dynmap-isthundering":false},"players":[]
+ },
+ "coordinate":{"x":343,"y":0,"z":391},
+ "radius":64
+ }
+]
diff --git a/.vim/vimwiki/vimwiki/work_clients_high_touch.wiki b/.vim/vimwiki/vimwiki/work_clients_high_touch.wiki
index cab487e..43a5f64 100644
--- a/.vim/vimwiki/vimwiki/work_clients_high_touch.wiki
+++ b/.vim/vimwiki/vimwiki/work_clients_high_touch.wiki
@@ -2,15 +2,4 @@
Luis R::
Timesheet: https://drive.google.com/?authuser=0&usp=sheets_web#folders/0B5hT8qJOi95WSnpLSWpKbUFOVkE
-
-RAC
-X* Activity Logging (Adminstrative Tasks)
-X * Need to add in permission level
-X * Be sure to catch new "Repost" function
-X * Always capture user id, username, permission level, timestamp
-X* Print out Terms and Conditions
-X * Probably off of menu item to launch new window with no fancies
-* New HTML email needs to be created
- * Certificate on payout
-
-
+[[work_clients_high_touch_enertech|Enertech]]
diff --git a/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech.wiki b/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech.wiki
new file mode 100644
index 0000000..e83c7e9
--- /dev/null
+++ b/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech.wiki
@@ -0,0 +1,3 @@
+=== High Touch - Enertech ===
+* [[work_clients_high_touch_enertech_capture|Capture App]]
+
diff --git a/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech_capture.wiki b/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech_capture.wiki
new file mode 100644
index 0000000..cbb9afd
--- /dev/null
+++ b/.vim/vimwiki/vimwiki/work_clients_high_touch_enertech_capture.wiki
@@ -0,0 +1,7 @@
+==== Capture App ====
+Make sure SQL is running
+If necessary, add 'socketPath' to mysql.sock to the exports.mysql in config.
+Slackware:
+ socketPath: '/var/run/mysql/mysql.sock'
+
+Make sure redis-server is running
diff --git a/.vim/vimwiki/vimwiki_html/Programming.html b/.vim/vimwiki/vimwiki_html/Programming.html
index d0f2f9d..7efc8f2 100644
--- a/.vim/vimwiki/vimwiki_html/Programming.html
+++ b/.vim/vimwiki/vimwiki_html/Programming.html
@@ -18,6 +18,13 @@ If no credentials, use https clone:
$HOME/.homesick/repos/homeshick/bin/homeshick clone https://brbuller@bitbucket.org/brbuller/vim-castle.git
-Spotify +#Dropbox +#Spotify Remoteless Helper (Spotify) GarageBand -ProPresenter 5 -Google Chrome +#ProPresenter 5 +#Google Chrome Keynote -Duo-Capture Driver +#Duo-Capture Driver
+Hold: +
+ ++[ + {"player":"mrmac131"}, + {"player":"anhalga"}, + {"player":"shellsmith"}, + {"server": +
++{ +"name":"yogs","url":"http:\/\/minecraft.br0xen.com:8123","type":"dynmap","custom":{"dynmap-version":"1.9.4-1940","dynmap-urls":{"markers":"tiles\/","update":"up\/world\/{world}\/{timestamp}","register":"up\/register","configuration":"up\/configuration","tiles":"tiles\/","login":"up\/login","sendmessage":"up\/sendmessage"},"dynmap-servertime":7981,"dynmap-hasstorm":false,"dynmap-isthundering":false},"players":[] +}, +"coordinate":{"x":343,"y":0,"z":391}, +"radius":64 ++
+ } +] +
+ +diff --git a/.vim/vimwiki/vimwiki_html/development_projects_irongolem.html b/.vim/vimwiki/vimwiki_html/development_projects_irongolem.html new file mode 100644 index 0000000..8d075ab --- /dev/null +++ b/.vim/vimwiki/vimwiki_html/development_projects_irongolem.html @@ -0,0 +1,34 @@ + + +
+ +
+ + +
+