Merge pull request #62 from Cegaiel/June_11_2012

.gitignore - Now ignores vines.txt
Vaevictusnet · Jun 11, 2012 · c19be12 · c19be12
2 parents 8326958 + 82617f7
commit c19be12
Show file tree

Hide file tree

Showing 13 changed files with 992 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 /VeggieTales/data/talescripts_version.txt
 /VeggieTales/fishlog.txt
 /VeggieTales/fishstats.txt
+/VeggieTales/vines.txt
 *.000
 *.001
 *.002

diff --git a/VeggieTales/images/vineyard/Vine_P_Bright_Bunch_CCG.png b/VeggieTales/images/vineyard/Vine_P_Bright_Bunch_CCG.png
diff --git a/VeggieTales/images/vineyard/cutting.png b/VeggieTales/images/vineyard/cutting.png
diff --git a/VeggieTales/images/vineyard/harvest.png b/VeggieTales/images/vineyard/harvest.png
diff --git a/VeggieTales/images/vineyard/vine_p_dexaglucose_10s.png b/VeggieTales/images/vineyard/vine_p_dexaglucose_10s.png
diff --git a/VeggieTales/images/vineyard/vine_p_four_skin_kkkk.png b/VeggieTales/images/vineyard/vine_p_four_skin_kkkk.png
diff --git a/VeggieTales/images/vineyard/vine_p_rainbow_aaccc.png b/VeggieTales/images/vineyard/vine_p_rainbow_aaccc.png
diff --git a/VeggieTales/images/vineyard/vine_p_sugar_high_11s.png b/VeggieTales/images/vineyard/vine_p_sugar_high_11s.png
diff --git a/VeggieTales/luaScripts/Flax_stable.lua b/VeggieTales/luaScripts/Flax_stable.lua
@@ -272,7 +272,7 @@ function doit()
   initGlobals();
   local startPos = findCoords();
   if not startPos then
-    error("Could not find ATITD clock.\Verify entire clock is displaying and all window borders showing.");
+    error("ATITD clock not found.\Verify entire clock and borders are visible. Try moving clock slightly.");
   end
 
   drawWater();