Commit graph

1791 commits

Author SHA1 Message Date
ganymedes01
21efd96004 You forgot to use the right method
Derpymar
2014-06-27 18:35:21 +01:00
Pahimar
97ad0db66a Switching to ore dictionary names for recipe inputs 2014-06-27 11:14:16 -04:00
Pahimar
4d939c8e60 Some work on getting recipes working again (yes, some recipes are INTENTIONALLY left out) 2014-06-26 16:05:18 -04:00
Pahimar
8a2226d483 When player data is loaded from disk, store the location it's reading the data from. Also, create a file for the player should one not already exist. 2014-06-26 15:19:59 -04:00
Pahimar
89abfee9f6 Update to Forge 1147 2014-06-26 15:19:19 -04:00
Pahimar
25c42f3ced Bump to Forge 1133 2014-06-22 18:01:08 -04:00
Pahimar
fecefc230a Add back in the fingerprint check messages (now that the build system is signing jar files again) 2014-06-22 14:12:47 -04:00
Pahimar
0961c35ab0 First stab at the Skills system (knowledge system) 2014-06-22 14:04:39 -04:00
Pahimar
5bfe76336c Add in some more testing with the Player load/save events (discovered a possible bug with the event for the loading of player data in a single player world) 2014-06-22 14:03:30 -04:00
Pahimar
c101a8f85e Move the default energy values to the init package 2014-06-22 14:02:15 -04:00
Pahimar
1a0627eed5 Remove unnecessary registries (they were placeholders to begin with) 2014-06-22 14:01:47 -04:00
Pahimar
82f82862a4 Add a very basic PlayerEventHandler to test the new events 2014-06-22 10:50:31 -04:00
Pahimar
17b1f506aa Bump to Forge 1131 to test the new Player events (LoadFromFile and SaveToFile) 2014-06-22 10:50:11 -04:00
Pahimar
4fb4480cd8 Fix up the referencing of client side code on the server (server wouldn't start because the client config was referencing Keybinding which is client side only) 2014-06-22 10:49:44 -04:00
Pahimar
af8621f480 Refactored references of Emc to EnergyValue and renamed the thread that initializes the value registry 2014-06-20 15:57:27 -04:00
Pahimar
1f726f33d9 Update default Exchange Energy values for vanilla items. 2014-06-20 14:56:24 -04:00
Pahimar
646631d074 More optimizations to DynEmc computation - definitely seems faster now! 2014-06-19 15:56:00 -04:00
Pahimar
c88b5dcad0 Should be a massive improvement in EE3 DynEmc start up time (removed a redundant and slow part of the DynEmc init) 2014-06-19 14:39:46 -04:00
Pahimar
3a4d06ad48 Working on getting the Exchange Energy system back up and running, and trying to optimize it 2014-06-19 14:18:04 -04:00
Pahimar
e77bb9ec48 Bump to latest Forge RB, and some work on getting Energy Value generation working again. More to be done! 2014-06-14 15:40:45 -04:00
pahimar
6bf7f4b0da Merge remote-tracking branch 'origin/master' 2014-06-09 18:20:34 -04:00
pahimar
6865b3e16c Fix build.gradle including files twice 2014-06-09 18:20:25 -04:00
pahimar
36256ad77a Fix a derp 2014-06-04 21:50:44 -04:00
pahimar
32c88a49eb Fix a derp 2014-06-04 21:49:23 -04:00
pahimar
d9e890322d Fix a derp 2014-06-04 21:46:42 -04:00
pahimar
2453d37657 Better protection for the build task if a user doesn't have the project parameters defined 2014-06-04 21:43:35 -04:00
pahimar
45984f8e26 Better protection for the build task if a user doesn't have the project parameters defined 2014-06-04 21:38:50 -04:00
pahimar
6094a3d7f6 Update to build 0.1.142 2014-06-04 21:23:17 -04:00
pahimar
2a7cfdc997 Put the changelog in the same folder as the finished jar 2014-06-04 21:02:28 -04:00
pahimar
26c2c78603 Fix logic derp that was preventing changelogs from ever being run 2014-06-04 21:00:55 -04:00
pahimar
a112f5e86d Add some protection for the build task so that if the user isn't running a Jenkins instance the build doesn't fail 2014-06-04 20:59:10 -04:00
pahimar
41c63e403a Testing more changelog generation 2014-06-04 20:28:22 -04:00
pahimar
7fc3ac8e4e Bumping Forge to 1110, and testing automatic changelog generation 2014-06-04 20:21:56 -04:00
Pahimar
618e46b26c Formatting 2014-05-27 16:10:13 -04:00
Pahimar
e13970633c Bumping Forge version (testing some Jenkins stuff too) 2014-05-27 15:27:11 -04:00
pahimar
8840b01e97 Merge pull request #680 from lluixhi/master
Don't forget the import statements for StatCollector, otherwise it fails to compile..
2014-05-27 09:18:35 -04:00
Lluixhi Scura
12fff5f26e Don't forget the import statements :P 2014-05-26 14:27:11 -07:00
Pahimar
e0718b48fe Merge remote-tracking branch 'origin/master' 2014-05-26 16:04:00 -04:00
Pahimar
39a6db0dce Playing around with some gradle improvements 2014-05-26 16:03:54 -04:00
pahimar
962f1a7def Merge pull request #673 from SquadMC/patch-1
Update README.md
2014-05-26 11:32:37 -04:00
pahimar
2c631f30f9 Merge pull request #679 from Enosphorous/master
Don't hardcode names in, use lang files!
2014-05-26 11:32:20 -04:00
Pahimar
b1cad58550 Bump to Forge 1095, and proper use of ObjectHolder (protip: instance variable names should match object names for easier ObjectHolder use) 2014-05-26 11:28:51 -04:00
Enosphorous
22483a7839 Don't hardcode names in. 2014-05-26 08:19:19 -07:00
pahimar
abde1fc874 Missed some files 2014-05-25 10:00:38 -05:00
pahimar
7bd8adf478 Working keybinding listener, and first stab at the ObjectHolder (some more learning necessary it seems, so commented out at the moment) 2014-05-25 09:55:50 -05:00
pahimar
06dced01b3 Merge remote-tracking branch 'origin/master' 2014-05-24 15:52:34 -05:00
pahimar
d18a1c2f3c Working on keybindings, going to test a FML fix for SimpleNetworkWrapper later 2014-05-24 15:52:23 -05:00
pahimar
31713ee4e6 Merge pull request #678 from theflogat/patch-1
Adding a needed parameter to @Instance
2014-05-24 14:18:15 -05:00
theflogat
e3d6273d01 Adding a needed parameter to @Instance
Adding a needed parameter to @Instance to avoid problems.
2014-05-24 19:54:46 +02:00
pahimar
99527d35a8 Working on keybindings 2014-05-22 17:35:31 -05:00