MachineMuse
|
28cec9ef09
|
test
|
2013-02-19 19:44:15 -07:00 |
|
MachineMuse
|
81472d4bfc
|
fresh build (again)
|
2013-02-18 23:45:49 -07:00 |
|
MachineMuse
|
c45f058af5
|
fresh build
|
2013-02-18 23:42:20 -07:00 |
|
MachineMuse
|
3524163a05
|
clean build
|
2013-02-18 23:41:16 -07:00 |
|
MachineMuse
|
4e5b582208
|
changed fileset syntax
|
2013-02-18 23:39:08 -07:00 |
|
MachineMuse
|
d27f054e16
|
changed build.xml to use fileset
|
2013-02-18 23:36:49 -07:00 |
|
MachineMuse
|
fd6c75a98a
|
modifying build.xml for whole directory
|
2013-02-18 23:35:38 -07:00 |
|
MachineMuse
|
98da8c8e18
|
including the whole UE api because the classes are all interdependent anyway
|
2013-02-18 23:32:02 -07:00 |
|
MachineMuse
|
c509a78ed2
|
new build
|
2013-02-18 23:23:57 -07:00 |
|
MachineMuse
|
54995ae649
|
Clean build
|
2013-02-18 23:23:13 -07:00 |
|
MachineMuse
|
3436c35c7f
|
added another necessary api file
|
2013-02-18 23:20:56 -07:00 |
|
Claire
|
b9a581607c
|
Merge pull request #84 from Andrew2448/master
Added saturation handling capabilities to the auto-feeder and added some more failsafe checks.
|
2013-02-18 22:19:20 -08:00 |
|
Claire
|
a474b56c45
|
Merge pull request #83 from Mattredsox/master
Added Multimeter Module
|
2013-02-18 22:19:00 -08:00 |
|
MachineMuse
|
9dfe761683
|
added necessary api file for multimeter
|
2013-02-18 23:17:49 -07:00 |
|
Andrew2448
|
ff33b376b8
|
Added saturation handling capabilities to the Auto-Feeder.
|
2013-02-19 00:06:13 -05:00 |
|
Mattredsox
|
2f67f37b1d
|
Added Multimeter Module
|
2013-02-18 21:02:45 -08:00 |
|
Andrew2448
|
25dc4ba4aa
|
Fixed merge error.
|
2013-02-18 22:12:58 -05:00 |
|
MachineMuse
|
725c8e625b
|
fix for feeder module activating with no food
|
2013-02-18 19:55:08 -07:00 |
|
MachineMuse
|
c496788945
|
fix for server-side sprint assist energy consumption
|
2013-02-18 19:49:46 -07:00 |
|
Andrew2448
|
c3bc265fad
|
Added a check to make sure the feeder has food before feeding.
|
2013-02-18 21:44:37 -05:00 |
|
MachineMuse
|
c08c3a2407
|
Added some bindable control types
|
2013-02-18 19:08:55 -07:00 |
|
Claire
|
7831611e5c
|
Merge pull request #77 from Andrew2448/master
Added a static generator module and buffed the generation rates of the solar module. Delete config for the changes to take place.
|
2013-02-18 18:07:10 -08:00 |
|
Andrew2448
|
b11927381c
|
Added static generator and tweaked generator rates. Dlete config for changes to take place.
|
2013-02-18 20:18:15 -05:00 |
|
MachineMuse
|
863c973b23
|
Fix for z affecting player even in gui with flight control
|
2013-02-18 14:28:11 -07:00 |
|
MachineMuse
|
ea2536cd14
|
fix for icons breaking with solar panel addon
|
2013-02-18 04:27:07 -07:00 |
|
Claire
|
8b7f062850
|
Merge pull request #75 from Andrew2448/master
Merged Andrew's changes for tonight~
|
2013-02-18 01:05:49 -08:00 |
|
Andrew2448
|
dd49c35e15
|
Added recipes and tweaked solar module.
|
2013-02-18 04:02:04 -05:00 |
|
Andrew2448
|
79b7c21e13
|
Added Solar Generator Module.
|
2013-02-18 02:49:35 -05:00 |
|
Andrew2448
|
1adced8817
|
Added a check to make sure the player has enough energy to be fed.
|
2013-02-18 01:24:32 -05:00 |
|
Claire
|
0d931f1e75
|
Merge pull request #73 from Andrew2448/master
Made auto-feeder energy consumption configurable.
|
2013-02-17 22:12:57 -08:00 |
|
Andrew2448
|
29e1eacbd6
|
Made auto-feeder energy consumption configurable.
|
2013-02-18 01:09:59 -05:00 |
|
Claire
|
80b2c0347c
|
Merge pull request #72 from Andrew2448/master
Added an Auto-Feeder module that will automatically store food levels and feed the player with its stored food levels.
|
2013-02-17 21:40:15 -08:00 |
|
Andrew2448
|
12c0d76457
|
Changed Auto-Feeder to a new temp texture.
|
2013-02-18 00:32:07 -05:00 |
|
Andrew2448
|
9734ef6f83
|
Finished all aspects of the Auto-Feeder module
|
2013-02-18 00:29:13 -05:00 |
|
Andrew2448
|
62b270ed70
|
Added tooltip for food level
|
2013-02-17 23:44:14 -05:00 |
|
Andrew2448
|
62b6a663be
|
Feeder module fully functional.
|
2013-02-17 23:23:40 -05:00 |
|
Andrew2448
|
7ca8b2e15d
|
FoodLevel handling full functional :D
|
2013-02-17 22:57:11 -05:00 |
|
Andrew2448
|
d37f907134
|
All but 1 bug working in foodLevel.
|
2013-02-17 22:49:26 -05:00 |
|
Andrew2448
|
4a3c446b3f
|
Fixed commit derp.
|
2013-02-17 22:24:18 -05:00 |
|
Andrew2448
|
1366de2f96
|
Removed some old stuff.
|
2013-02-17 22:22:38 -05:00 |
|
Andrew2448
|
52b9a10788
|
Halfway functionality...still working on it.
|
2013-02-17 22:20:22 -05:00 |
|
MachineMuse
|
7a54fb396d
|
swapped iridium plates for tungsteel ingots in field emitters for gregtech users
|
2013-02-17 16:50:41 -07:00 |
|
MachineMuse
|
61cb9c43b2
|
bumped version number for recommended release
|
2013-02-17 16:35:35 -07:00 |
|
MachineMuse
|
8e97876670
|
quickfix for fall damage issue
|
2013-02-17 16:35:07 -07:00 |
|
Andrew2448
|
2335d53369
|
Renamed Eater to Feeder.
|
2013-02-17 17:59:27 -05:00 |
|
Andrew2448
|
f9092127bb
|
Updated the Config.java. Functionality next.
|
2013-02-17 17:54:43 -05:00 |
|
Andrew2448
|
1fd194f58a
|
Testing this git derping.
|
2013-02-17 17:37:19 -05:00 |
|
MachineMuse
|
bb1fe62cf4
|
disabled in-dev blink drive for voltz release
|
2013-02-16 10:51:38 -07:00 |
|
MachineMuse
|
ee710501d7
|
fixed some blink drive things
|
2013-02-15 15:51:44 -07:00 |
|
Claire
|
9c85823439
|
Merge pull request #61 from horsenit/master
Tinker Table renderInventoryBlock stuffo
|
2013-02-15 11:54:32 -08:00 |
|