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 |
|
pahimar
|
61e9278915
|
Bump up Forge version to Forge 1084
|
2014-05-20 22:20:08 -04:00 |
|
Pahimar
|
a2a82d3d36
|
Tweaking some build script and mcmod stuff
|
2014-05-16 11:48:51 -04:00 |
|
Pahimar
|
dbae8445ab
|
Missed a period
|
2014-05-15 14:54:20 -04:00 |
|
Pahimar
|
36256cdd3f
|
Improving the build gradle script a bit
|
2014-05-15 14:49:52 -04:00 |
|
pahimar
|
422fd7abc7
|
Update build.gradle
|
2014-05-04 21:13:13 -04:00 |
|
Pahimar
|
8ee4fa0147
|
Some starter work on keybindings and config files
|
2014-05-02 16:06:56 -04:00 |
|
pahimar
|
26d3a5dd11
|
Re-implemented Alchemical Bag functionality, and added back the fuel handler
|
2014-04-30 19:33:29 -04:00 |
|
pahimar
|
cf1dcfa1a0
|
Merge remote-tracking branch 'origin/master'
|
2014-04-30 18:03:22 -04:00 |
|
pahimar
|
5a8665a581
|
Fixes chest lids in MP
|
2014-04-30 18:01:35 -04:00 |
|
pahimar
|
3362621750
|
Moving the intialization of items and blocks to the init package, and simplifying things and removing the infused blocks (Aludel recipes will take their place)
|
2014-04-29 22:26:30 -04:00 |
|
pahimar
|
ac207393fe
|
Managed to get a few things done today
|
2014-04-29 21:46:59 -04:00 |
|
pahimar
|
5794037f51
|
Getting ma groove on
|
2014-04-28 21:24:31 -04:00 |
|
Sam
|
661270784f
|
Update README.md
Fixed Readme for Copy and past for `setupCiWorkspace`
|
2014-04-28 19:29:47 +01:00 |
|
Pahimar
|
7acc4f0c16
|
Bump the version of Forge to 1061
|
2014-04-23 09:00:45 -04:00 |
|
pahimar
|
664387f063
|
Machines: Getting them to render in world. Still not functional.
|
2014-04-11 16:01:11 -04:00 |
|
pahimar
|
ac14fe32ab
|
Machines: Getting more of the machines implemented, still a WIP
|
2014-04-11 07:06:32 -04:00 |
|
pahimar
|
f6d58abca2
|
Getting Alchemical Chests into the port. They definitely aren't finished yet, networking still to be done.
|
2014-04-10 19:59:04 -04:00 |
|
pahimar
|
7b97cea430
|
Backport to Forge 1056, something's not hashing with Forge 1057
|
2014-04-07 19:57:44 -04:00 |
|