Commit graph

202 commits

Author SHA1 Message Date
MachineMuse
e563362075 replaced recipes with things that are registered 2013-02-08 13:59:56 -07:00
MachineMuse
9270f3a1e9 same 2013-02-08 13:55:01 -07:00
MachineMuse
940a970f65 Thermex prints names if item get fails 2013-02-08 13:50:54 -07:00
MachineMuse
ff2ce52673 will get this eventually 2013-02-08 13:43:16 -07:00
MachineMuse
ccc25d3909 changed item getting method 2013-02-08 13:38:52 -07:00
MachineMuse
7d22f80f0a adjusted recipes 2013-02-08 13:18:54 -07:00
MachineMuse
278982cb60 tweaking build script 2013-02-08 12:56:43 -07:00
MachineMuse
620ca249e7 tweaking build script 2013-02-08 12:55:30 -07:00
MachineMuse
e4d565aa02 added thermalexpansion api to build script 2013-02-08 12:54:05 -07:00
MachineMuse
dd5dc08bb1 Added preliminary ThermEx recipes 2013-02-08 12:48:15 -07:00
MachineMuse
22394c77e3 added thermex hooks, no recipe yet 2013-02-07 18:09:15 -07:00
MachineMuse
4cd9f8409f added field emitters to IC2 recipe 2013-02-06 15:42:54 -07:00
MachineMuse
06b25524a4 added bindable control interface 2013-02-06 15:41:18 -07:00
MachineMuse
cd1c710ae2 Tripled max reduction 2013-02-06 07:42:29 -07:00
MachineMuse
3f79724a62 fixed a nullpointer case when getting items from ic2 api 2013-02-05 18:04:20 -07:00
MachineMuse
ce68f12ad5 changed thaumgoggles to 'special' 2013-02-05 11:34:44 -07:00
MachineMuse
851a67cd43 items now remove enchantments placed with anvil 2013-02-05 07:02:41 -07:00
MachineMuse
7a44a95ae5 removed SU battery recipe, maybe fixed minimap flicker 2013-02-05 06:11:11 -07:00
MachineMuse
9e34b4d228 Added more ic2 battery recipes 2013-02-04 18:27:30 -07:00
MachineMuse
19ef4cbe46 more mode switching work, no real changes 2013-02-04 18:04:20 -07:00
MachineMuse
e86bf607a1 Hello? Jenkins? What are you doing, honey? 2013-02-04 08:59:50 -07:00
MachineMuse
e3e1456941 Changed energy and control calculations on Flight Control module 2013-02-04 08:50:23 -07:00
Claire
f83e808923 Merge pull request #27 from pixotic/Pixtest1
Test of github/ghfw functionality
2013-02-04 02:27:57 -08:00
Richard Goodwins
ba2f5d8283 Test of github/ghfw functionality 2013-02-04 12:13:21 +02:00
MachineMuse
a9ba9e6a3a Fix skybox lighting issue 2013-02-03 19:50:13 -07:00
MachineMuse
aff70ffc0f don't use client-only code on server... 2013-02-03 19:32:12 -07:00
MachineMuse
268f5acc12 changed handling of potion effects 2013-02-03 19:31:36 -07:00
MachineMuse
f674230087 fix for keybind buttons not moving 2013-02-03 19:00:28 -07:00
MachineMuse
79caa2f45b changed category to make them fit on the screen, for now 2013-02-03 17:56:05 -07:00
MachineMuse
a35b9fb805 Added flight control module. 2013-02-03 17:54:18 -07:00
MachineMuse
8f3e602942 changed sprint/walk boost energy consumption 2013-02-03 15:19:10 -07:00
MachineMuse
be86893381 fix step height 2013-02-03 15:05:10 -07:00
Claire
c068dd27fe Merge pull request #22 from bartbes/master
Fix ConcurrentModificationException on potion removal
2013-02-03 13:13:43 -08:00
MachineMuse
8a032e38b5 changed client concurrentmodification fix on potions 2013-02-03 14:11:43 -07:00
MachineMuse
3fc65ca64b Last memory leak fixed (I think) 2013-02-03 14:05:27 -07:00
Bart van Strien
55ce802635 Fix ConcurrentModificationException on potion removal 2013-02-03 21:58:51 +01:00
MachineMuse
71c8e46a44 Circle memory leak: half-smooshed 2013-02-03 12:15:40 -07:00
MachineMuse
1ca2296a37 Eliminated another memory leak in tinkertable...1 more to go! 2013-02-03 11:31:59 -07:00
MachineMuse
6f2fd8f223 another typo lol 2013-02-03 10:56:07 -07:00
MachineMuse
8742fbaccb centralized tool texture 2013-02-03 10:53:39 -07:00
MachineMuse
da87ab8943 fixed typo in resource path 2013-02-03 10:52:50 -07:00
MachineMuse
48bfff4621 Repackaged resources 2013-02-03 10:46:34 -07:00
MachineMuse
17bf507c74 more repackaging, changed default joule ratio to be BC joules 2013-02-02 05:33:02 -07:00
MachineMuse
e6e075dc74 Added walking speed bonus to sprint assist 2013-02-02 04:14:34 -07:00
MachineMuse
87ff814503 Merging api changes 2013-02-02 03:56:43 -07:00
MachineMuse
cc0de8a543 Made config file more robust, thanks to bdew 2013-02-02 03:55:34 -07:00
MachineMuse
262e1f5cce Added auto-gen config files for modules and module number values 2013-02-02 03:55:32 -07:00
MachineMuse
1638927bd4 Maybe fixed inventory render issue, added comments 2013-02-02 03:54:30 -07:00
MachineMuse
6fcaa0f6f2 Repackaged api 2013-02-02 03:39:54 -07:00
MachineMuse
5b6e4eb6ad Removed easy control circuit recipe 2013-02-01 10:13:22 -07:00