Commit graph

4413 commits

Author SHA1 Message Date
Rseifert
c794d11880 dido
more stuff to make combatible with jenkins. ug
2012-08-28 10:11:13 -04:00
Rseifert
4911151bec . 2012-08-28 09:01:41 -04:00
Rseifert
fab70e6e85 . 2012-08-28 09:01:05 -04:00
Rseifert
bd35ad9a56 Setting up for jenkins 2012-08-28 08:59:21 -04:00
Rseifert
45ed6f0d7f fixed a server side bug
not sure why i got a method not found error for this but it looks like
its fixed
2012-08-27 21:26:46 -04:00
Rseifert
21afceb5ed Config file fix 2012-08-27 20:11:03 -04:00
Rseifert
bac2723c43 Added the start of a generator block 2012-08-27 19:37:45 -04:00
Rseifert
93d020863c Clean up and bugs fixes 2012-08-27 19:37:32 -04:00
Rseifert
66fc0aee1b git repo moved to project folder
src will now upload strait from my MCP project location. Meaning the
package names changed just in git.
2012-08-27 09:11:16 -04:00
Rseifert
40f0710849 Update of code
I really should have update git after i changed packages. Now there so
many changes i really don't care to sort threw them. Main changes though
are boiler tank model/code changed to show corner block when more than
one boil is placed togther. Steam engine was changed to steam piston set
and shows animation when running. FireBox now shows flames on the
correct side. All models rotate as well but only when first placed. No
wrench rotation support will be added. A lot of code cleanup and bug
fixes including an infinite water loop in the boiler tanks.
2012-08-27 07:59:13 -04:00
Rseifert
5a0fd88182 Init 1.3.2 Update upload
Most of it is working just need some more work before can be call
Updated. Still have to fix model rotations, Add new steam engine, Add
Eletric motor block, Add crank Shaft, Fix all models to fit to pipes, Re
do pipes to look nicer. Most likely i need to fix both steam engine and
boiler's share resources methods, and Generation methods
2012-08-23 04:02:25 -04:00
Rseifert
5a4c49b0cc Pre for update.Archived 1.2.5 Code 2012-08-21 16:05:21 -04:00
DarkGuardsman
bb6b51d255 Merge pull request #3 from atrain99/master
I just cleaned up a few things. No biggie.
2012-07-23 12:57:51 -07:00
AJ Fleming
eb540c69f5 Simplified exactly 3 things. 2012-07-23 12:36:41 -05:00
AJ Fleming
a87c6510a7 Imported class. "Roses are red, violets are blue, remember to import, or you'll just have to type!"-Headfirst Java 2012-07-23 12:34:33 -05:00
AJ Fleming
e554343643 Spelling fixes. 2012-07-23 12:32:20 -05:00
Rseifert
b511034970 update pics 2012-07-22 21:27:00 -04:00
Rseifert
bd4fb9ccd2 recoded control to use bots
setup controler to use bots for task rather than mine itself.
2012-07-22 21:24:46 -04:00
Rseifert
965e482e13 setup shoeBot to do basic harvesting 2012-07-22 21:24:06 -04:00
Rseifert
728095f8ba Coded robot bas class
code a ton of stuff into the base class for the  robots. add basic
functions for seting up task, collecting blocks,harvesting block,
finding controler
2012-07-22 21:23:41 -04:00
Rseifert
fbb7a56c6f Code cleanup
removed grinder code from git repo in favor of using hawks grinder.
2012-07-22 21:21:39 -04:00
Rseifert
3c1a173070 . 2012-07-22 07:00:49 -04:00
Rseifert
0f051e6de9 added controler block 2012-07-22 06:57:14 -04:00
Rseifert
249c6cfef6 Made a basic harvester block
basic harvester proto type too test search function for bots.
2012-07-22 06:56:53 -04:00
Rseifert
35b1f75329 Code cleanup and bug fixes
mainly just a code upload but cleanup and bug fixes were made but not
finished.
2012-07-22 06:56:05 -04:00
Rseifert
916ddca95d code Clean up
cleaned up code, remove condernser, re added recipes, fixed recipes for
basic pipes use,etc
2012-07-16 14:15:07 -04:00
Rseifert
9e67cbf2e3 . 2012-07-16 14:14:17 -04:00
Rseifert
4809099e8a Code for automation
will seperate into its own repo later.
2012-07-16 14:14:08 -04:00
Rseifert
82106411b7 Deleted code that slipped in 2012-07-16 14:12:51 -04:00
Rseifert
2043d4b09e seperated pipes to another repo
cleaning up how i do stuff and moved pipes to its own repo
2012-07-13 18:34:40 -04:00
Rseifert
07f231fb72 removed some classes/updated some stuff 2012-07-13 17:36:01 -04:00
DarkGuardsman
be1391391d forgot '+' 2012-07-11 05:39:55 -03:00
DarkGuardsman
75a33719a7 Merge pull request #2 from atrain99/master
Fix item Textures! :)
2012-07-10 10:42:58 -07:00
atrain99
5dae4c992f Merge branch 'master' of https://github.com/atrain99/Dark-sIndustry 2012-07-10 10:11:52 -05:00
atrain99
44604ee2d5 Texture Fixes 2012-07-10 10:11:11 -05:00
AJ Fleming
030d0725b4 Fix texture Indices 2012-07-10 10:10:07 -05:00
DarkGuardsman
2213013cfa Update master 2012-07-10 06:39:51 -03:00
DarkGuardsman
8dffee1d42 Added doc to code 2012-07-10 06:38:59 -03:00
DarkGuardsman
6a704fbc8b Add docs to code 2012-07-10 06:36:49 -03:00
DarkGuardsman
78937cbf29 Add some documentation to code 2012-07-10 06:33:44 -03:00
Rseifert
357ad64fd7 Corrected add connections with old code
readded code from old steam pipes to pipe code too use a clean and
better pipe connection code. A lot easier to read and should check if it
can connect on weither or not that side does anything.
2012-07-10 05:24:41 -04:00
Rseifert
0ffc8eab65 upload textures
This is the correct spot for the textures too work when compiled. For
eclipse they go into eui/ in defualt package
2012-07-10 03:13:50 -04:00
Rseifert
d776f1842d Corrected and cleanup code
Changed names from electric/watt to Volume/vol. Also cleaned up some
code and remove un needed code that made its.....
2012-07-10 03:11:12 -04:00
Rseifert
6624b8455d Version Change 2012-07-10 03:09:55 -04:00
Rseifert
646befeaa2 Added Test Item
Use this too get volume in pipes
2012-07-10 03:09:37 -04:00
Rseifert
4efc554934 Code upload
no real changes
2012-07-10 02:54:04 -04:00
DarkGuardsman
4e37d9bba4 removed unneeded code. canProduceLiquid is use to control connections. No need to double up code 2012-07-10 03:50:54 -03:00
DarkGuardsman
ae6896e292 removed unNeeded Code Sorry aTrain but canRecieveLiquid is used to determin connection 2012-07-10 03:48:42 -03:00
calclavia
a5d1fac4e7 Merge pull request #1 from atrain99/master
Changed Pipe tileEntity, the API interfaces, added textures.
2012-07-09 18:30:54 -07:00
atrain99
8b0d8a9c82 Texture Files now included 2012-07-09 19:54:56 -05:00