pahimar
75dd447044
Added RecipesAludel support to RecipeRegistry, so that items can have their values assigned via DynEmc
2014-02-01 11:01:56 -05:00
pahimar
748f6ca593
Merge pull request #612 from Dynious/AludelRecipeFix
...
Fixes Aludel consuming wrong amount of items
2014-02-01 07:51:07 -08:00
RedmenNL
abd00dc200
Fixes Aludel consuming wrong amount of items
2014-02-01 15:10:19 +01:00
pahimar
bb5e20cd13
Bit of work on some stuff, super generic as always
2014-01-31 21:54:41 -05:00
pahimar
7a2c0c79c3
Merge pull request #608 from SpartaMercenary/master
...
Tidied up the log and debug methods in LogHelper
2014-01-31 18:22:37 -08:00
pahimar
076d17de2c
Merge pull request #610 from Dynious/ParticleFix
...
Fixes Aludel fire particle placing
2014-01-31 18:21:01 -08:00
pahimar
771e95c756
Can shift click items with fuel values into the Input slot of the Aludel
2014-01-31 13:18:15 -05:00
RedmenNL
09a36126b0
Fixes Aludel fire particle placing
2014-01-31 15:26:52 +01:00
pahimar
810232cfe0
Fixes #609
2014-01-30 22:05:46 -05:00
pahimar
ca6b8cd560
Yay Aludel :)
2014-01-30 22:03:11 -05:00
Brian
70f6782788
Tidied up the log and debug methods in LogHelper
...
Changed the manual null check and String conversion in LogHelper to the static String.valueOf() method, which automatically performs a null check and handles it appropriately. See [String.valueOf(Object)](http://docs.oracle.com/javase/7/docs/api/java/lang/String.html#valueOf(java.lang.Object\) )
2014-01-26 18:56:22 -05:00
pahimar
490c9342ba
Merge pull request #596 from ganymedes01/master
...
A simple way to assign EMC values
2014-01-24 07:28:55 -08:00
pahimar
6301083b36
Merge pull request #603 from Dynious/NBTFix
...
Fixed NBTTagged Itemstack crashing GSON (de)serialization
2014-01-24 07:27:07 -08:00
pahimar
b8437deee4
Merge pull request #604 from Dynious/RecipeAludel
...
Finished matches method in RecipeAludel
2014-01-24 07:26:45 -08:00
RedmenNL
d3e6332d48
Fixed OreStack EMC values not being looked up properly
2014-01-24 11:39:11 +01:00
RedmenNL
c43c341412
Finished matches method in RecipeAludel
2014-01-23 20:28:13 +01:00
RedmenNL
048204c145
Fixed NBTTagged Itemstack crashing GSON (de)serialization
2014-01-23 19:16:26 +01:00
pahimar
eed4a7bdaa
Work on getting the Aludel working - to be continued on my desktop
2014-01-19 11:18:16 -05:00
ganymedes01
ce2e33996d
Update InterModCommsHandler.java
2014-01-17 15:17:42 +00:00
ganymedes01
b19b667bae
Update InterModCommsOperations.java
2014-01-17 15:17:23 +00:00
pahimar
baf7d501a4
Fixes #592 . Can't even remember why that was there in the first place
2014-01-16 16:51:15 -05:00
pahimar
71b9d9a184
Optimize some code, and fix up dust stack rendering (colour) once and for all
2014-01-16 11:21:28 -05:00
pahimar
20b23ee923
More work on getting the dusts rendering properly (using @psxlover's suggestion)
2014-01-13 14:47:39 -05:00
pahimar
4381b89b9f
Merge pull request #574 from SoldierW518/patch-1
...
Update ConfigurationSettings.java
2014-01-13 06:18:18 -08:00
pahimar
eac7f32e2b
In light of now knowing the blockEvent data payloads are limited to a byte in size, changed up the network communication for dust updates
2014-01-12 22:14:24 -05:00
SoldierW518
1a03cb8c45
Update ConfigurationSettings.java
...
That should say mob not block.
2014-01-12 15:38:44 -05:00
pahimar
025bb567fb
Noting the bug in the coden
2014-01-12 13:54:12 -05:00
pahimar
d81d5594e2
Fixing a sided error, but also discovering a dust stack colour bug in SMP
2014-01-12 13:52:52 -05:00
pahimar
58bd0a1dca
Just cleaning up some stuff
2014-01-12 12:42:41 -05:00
pahimar
f16ff69042
Fixes #570
2014-01-12 12:40:30 -05:00
pahimar
0f8fbb7154
Merge remote-tracking branch 'origin/master'
2014-01-12 12:36:09 -05:00
pahimar
ca38bdde89
Fix the Calcinators gui name
2014-01-12 12:35:58 -05:00
ganymedes01
f27b580e01
Fix for calcinator light level update
...
Force a light level update every time the tile entity state is changed.
Could also be done by sending an eventId == 6 and make that update the light level, but I think this way is simpler and it makes sure the light level is updated only after the state is changed
2014-01-12 16:50:24 +00:00
pahimar
cea970194e
Short of a light update bug, I think the Calcinator is done!
2014-01-12 10:51:26 -05:00
pahimar
07bd30b254
Just about done with the Calcinator
2014-01-11 18:47:17 -05:00
pahimar
b07d70a84e
Active calcinator texture
2014-01-11 18:42:40 -05:00
pahimar
f56791ee08
Calcinator network work
2014-01-11 17:41:28 -05:00
pahimar
a328988b28
Calcinator network work
2014-01-10 23:54:39 -05:00
pahimar
fa7df500f6
Aludel recipes whilst watching Netflix. Guess what won? :-p
2014-01-10 22:03:49 -05:00
pahimar
e40e0f1396
More work on the Aludel recipe manager
2014-01-09 22:47:26 -05:00
pahimar
9602bbf353
Aludel work
2014-01-07 18:42:29 -05:00
pahimar
46057f06bb
Remove the old method of getting minium shards
2014-01-06 20:15:37 -05:00
pahimar
846994f163
Remove a debug related string from the Alchemical Chest gui
2014-01-06 18:59:26 -05:00
pahimar
700275da34
The great localization purge of 2014
2014-01-06 18:51:57 -05:00
ganymedes01
cca58c6797
Change event priority for tooltip event
...
Makes sure the event is called after (as much as possible of course) all other tool tip events, so that the EMC value is always the last thing on the item tool tip and avoids it ending up in between the tooltips added by two different mods.
2014-01-06 16:56:17 +00:00
pahimar
146dc0a1de
Just some more Alchemical Chest stuff :)
2014-01-05 22:22:59 -05:00
pahimar
7c20a2db99
Condensed the Alchemical Chest GUI/inventory stuff
2014-01-05 19:41:27 -05:00
pahimar
5a580e9028
Merge pull request #558 from klmDF14J/master
...
Prevented crash when right-clicking the aludel
2014-01-05 13:25:16 -08:00
monster860
af0b4545ed
Fixed #559
2014-01-05 14:14:23 -05:00
Mr KM
6fe08bee3b
Prevented crash when right-clicking the aludel
...
Checks if the stack is null before attempting to get the item ID
2014-01-05 17:40:56 +00:00
pahimar
f8237d6c89
More Alchemical Chest/Inventory stuff
2014-01-05 12:16:48 -05:00
pahimar
be86ee89af
The different sized Alchemical Chests aren't quite working yet, but loads of GUI work and textures and stuff tonight
2014-01-04 23:02:06 -05:00
pahimar
081730ad4b
Lots more experimental changes :)
2014-01-04 18:38:42 -05:00
pahimar
2ad08cbdc5
Some very experimental stuff with "infused" blocks
2014-01-04 12:53:23 -05:00
pahimar
070528db9b
Move away from serializing ItemStack directly. Instead, use a false ItemStack to store only the values we care about (solves Gson related issues with ItemStack in the mod)
2014-01-04 12:52:59 -05:00
pahimar
e3e6d533e2
Recipe for the Research Station
2014-01-02 23:52:18 -05:00
pahimar
0817d3cc51
Made it so you can more easily place a glass bell on an aludel base
2014-01-02 23:49:26 -05:00
pahimar
49e7bb97d8
Adding some preliminary work on the Research Station
2014-01-02 22:48:09 -05:00
pahimar
ad6e7f3f3a
Keybinding optimization
2014-01-02 21:33:04 -05:00
pahimar
eb9205f189
Changing up how the EMC overlay works
2014-01-02 20:54:54 -05:00
pahimar
0f4746336d
EmcValues
2014-01-02 20:35:21 -05:00
pahimar
e4b0f8a99c
EmcValues
2014-01-02 20:32:28 -05:00
pahimar
6efe7ebe9a
More optimization of the codebase
2014-01-02 16:09:59 -05:00
pahimar
ea3fcd11b7
Merge pull request #552 from JohnSmith114/master
...
Corrected some errors and finished the Version check localizations on it_IT.lang
2014-01-02 12:51:47 -08:00
pahimar
76ab773b57
Merge pull request #551 from VeryBigBro/patch-3
...
Update ru_RU.lang
2014-01-02 12:51:42 -08:00
pahimar
a55b3ff091
Merge pull request #549 from Leon1236/patch-2
...
Create hr_HR.lang
2014-01-02 12:51:37 -08:00
JohnSmith114
2bb065bf65
Corrected some errors and finished the Version check localizations
2014-01-02 21:34:46 +01:00
Anton
c74b4c6619
Update ru_RU.lang
2014-01-02 14:35:03 +03:00
pahimar
8ed0f1ecdd
Some optimizing of Item code
2014-01-02 03:55:01 -05:00
pahimar
391cd2b03d
Block fixes
2014-01-02 03:19:19 -05:00
pahimar
df8aa8e7d9
Localization stuffs
2014-01-02 02:35:25 -05:00
pahimar
b6094df8c6
Changing around some textures
2014-01-02 02:25:56 -05:00
pahimar
898e7b44f6
Optimizing a ton of stuff in the block classes
2014-01-02 02:21:46 -05:00
pahimar
2b66e13ff2
Just some stuff
2014-01-02 01:00:00 -05:00
pahimar
22170ede54
Fixed #550
2014-01-01 22:15:28 -05:00
pahimar
0114340844
Some preliminary work on transmutation squares
2014-01-01 21:18:10 -05:00
pahimar
8b17f1fa26
Playing around with some stuff
2014-01-01 18:18:59 -05:00
Leon1236
b92ea5741d
Create hr_HR.lang
...
Added Croatian translation by Leon1236
2014-01-01 20:35:14 +01:00
pahimar
4abd5b121a
Reverting out last MCPC+ bugfix changes - looks like the bug is best resolved on MCPC+'s side (marking ItemStack.EntityItemFrame as transient, and so preventing gson'd ItemStacks from overflowing the stack)
2013-12-31 03:42:32 -05:00
pahimar
4caf4e1237
Another attempt at the MCPC+ bug
2013-12-31 03:23:06 -05:00
pahimar
3c3c17d18b
Another attempt at the MCPC+ bug
2013-12-31 03:04:50 -05:00
pahimar
6728bd5871
Another attempt at the MCPC+ bug
2013-12-31 02:39:17 -05:00
pahimar
13f3ccd175
Another attempt at the MCPC+ bug
2013-12-31 02:30:41 -05:00
pahimar
5dc0d1a973
Another attempt at the MCPC+ bug
2013-12-31 02:07:23 -05:00
pahimar
fa283b24eb
Seems like it worked for WrappedStack! Now to fix RecipeMapping
2013-12-31 01:56:15 -05:00
pahimar
ebccba0d3b
Another attempt at the MCPC+ bug
2013-12-31 01:50:47 -05:00
pahimar
31cb980a52
Another attempt at fixing the MCPC+ and EE3 gson bug
2013-12-31 01:37:42 -05:00
pahimar
e0a2395c72
Moving some things around, and may have fixed the Gson issue with MCPC+
2013-12-31 01:24:35 -05:00
pahimar
458ec07c21
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/373
2013-12-31 00:36:51 -05:00
pahimar
98188ba872
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/506
2013-12-31 00:25:47 -05:00
pahimar
bf7eeb97ed
Merge remote-tracking branch 'origin/master'
2013-12-31 00:12:17 -05:00
pahimar
6c072974f3
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/532
2013-12-31 00:12:02 -05:00
pahimar
dc6fe0576a
Merge pull request #530 from Vexatos/patch-1
...
Updated de_DE.lang
2013-12-30 21:08:42 -08:00
pahimar
3909894172
Merge pull request #539 from VeryBigBro/patch-2
...
Update ru_RU.lang
2013-12-30 21:08:34 -08:00
pahimar
926942131b
Merge pull request #544 from Asajz/patch-1
...
Update es_ES.lang
2013-12-30 21:08:25 -08:00
pahimar
c6de187b69
Merge pull request #531 from crafteverywhere/patch-6
...
Update zh_CN.lang
2013-12-30 21:08:16 -08:00
pahimar
5e9a29123d
Testing moving the EmcRegistry initialization to its own thread
2013-12-30 23:51:15 -05:00
pahimar
56d24ef958
More testing
2013-12-30 23:12:31 -05:00
pahimar
66b2cfcfc0
Taking this to extremes to test this damned NEI + EE3 "bug"
2013-12-30 22:58:17 -05:00
pahimar
f9ef8c92bc
Remember to turn them off Pahimar, sheesh
2013-12-30 22:34:19 -05:00
pahimar
927bce7c28
Testing to see if tooltips are the cause of the EE3 + NEI "lag"
2013-12-30 22:33:15 -05:00
pahimar
3039c2d71d
Some preliminary work on transmutation squares
2013-12-30 21:41:10 -05:00
ganymedes01
d7300d6bde
Correct chalk block recipe
2013-12-31 00:36:59 +00:00
pahimar
3ae4e5d2ba
Other than some display related stuff, the Calcinator is pretty much "done"
2013-12-30 17:53:28 -05:00
pahimar
3c5577226d
Cleaning up some stuff
2013-12-29 22:49:18 -05:00
pahimar
ed463d38c2
Some simple particle effects for the fire pot on the calcinator
2013-12-29 22:44:06 -05:00
pahimar
32615463ac
Some work on getting the Calcinators GUI to be more informative. Some small corner cases remain. That, and rendering it when its active.
2013-12-29 22:04:57 -05:00
pahimar
4066e6f6b0
Fix up the EmcValue for chalk, and added some recipes to make chalk blocks from 4 pieces of chalk
2013-12-29 00:45:46 -05:00
pahimar
1c23ca22aa
Fix corner cases which would have allowed duplicate entries to be attempted in EmcRegistry
2013-12-29 00:32:20 -05:00
Asajz
442dca2a68
Update es_ES.lang
...
A few minor changes to fix grammar.
2013-12-28 22:59:04 -06:00
pahimar
40f7f3e854
Some improvements to how values are added to the EmcRegistry (checks for duplicates, and takes the lower value (default and pre-assign finished))
2013-12-28 23:48:26 -05:00
pahimar
211c87930e
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/543
2013-12-28 21:20:57 -05:00
pahimar
d67dc49671
Remove the test comment
2013-12-28 18:06:31 -05:00
pahimar
14b028c3ea
Just a test to see how the Jenkins job is working
2013-12-28 17:59:37 -05:00
pahimar
57e22d4d71
Really, REALLY fix the fuel handler derp
2013-12-28 14:40:04 -05:00
pahimar
28b1a5edfc
Fixes NEI + my fuel handler derp
2013-12-28 10:27:27 -05:00
Anton
8063a00141
Update ru_RU.lang
2013-12-28 16:29:17 +03:00
Vexatos
e8c5285b37
Resorting and stuff
2013-12-28 13:09:13 +01:00
pahimar
371541a07a
Re-jigged the alchemical fuels to conserve block/item ids
2013-12-28 00:08:13 -05:00
pahimar
65d71da66d
Added Alchemical Coal, Mobius Fuel, and Aeternalis Fuel. EmcValues and crafting methods for them still to come
2013-12-27 19:54:31 -05:00
pahimar
6daa78de20
Just some refactoring before a sprint of work tomorrow
2013-12-26 20:59:51 -05:00
pahimar
1bcfc551be
And now for the XCFs
2013-12-26 11:18:53 -05:00
pahimar
7ac6988b6f
Forgot to commit the textures
2013-12-26 11:18:00 -05:00
Vexatos
a02b7c9cd9
I know it's Latin. That's why I don't translate it
2013-12-26 09:30:45 +01:00
pahimar
aad4435415
Just a few items you might know of from before
2013-12-25 08:50:07 -05:00
crafteverywhere
8ab9d28470
Update zh_CN.lang
2013-12-24 21:42:07 +08:00
Vexatos
49c3503417
Update de_DE.lang
2013-12-24 14:22:09 +01:00
pahimar
60423c1421
Calcinators now produce dust
2013-12-23 22:13:57 -05:00
pahimar
b69954c4c5
Just some more quick work before going out yet again for Christmas
2013-12-23 08:47:37 -05:00
pahimar
0e47572bac
Just some quick work before going out yet again for Christmas
2013-12-23 08:41:34 -05:00
pahimar
6dee38c4e1
Some more work on the CalcinationManager
2013-12-21 22:03:32 -05:00
pahimar
434650a7d8
Forcing EmcValues to have (at most) 4 points of precision
2013-12-21 19:42:18 -05:00
pahimar
2ca30f4845
Some mucking about
2013-12-21 17:16:55 -05:00
pahimar
3be12ee169
Thought I would have gotten more done at work today :)
2013-12-20 15:53:37 -05:00
pahimar
f0b08b431f
Cleaning
2013-12-20 06:58:15 -05:00
pahimar
e2378f77b6
Cleaning
2013-12-19 18:41:22 -05:00
pahimar
a545d4519e
Stop container items from affecting EmcValue assignment
2013-12-19 17:59:31 -05:00
pahimar
8db88278f3
Reminder to self
2013-12-19 00:23:06 -05:00
pahimar
84a0410815
Reminder to self
2013-12-19 00:21:58 -05:00
pahimar
b5bf06b9f7
Bunch of work on FluidStack handling in DynEmc stuffs
2013-12-19 00:19:15 -05:00
pahimar
2285f4e33b
Work on EquivalencyStack
2013-12-17 21:07:30 -05:00
pahimar
19569e490f
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/491
2013-12-17 15:56:56 -05:00
pahimar
9b5a0db9aa
Fixes https://github.com/pahimar/Equivalent-Exchange-3/issues/508
2013-12-17 15:52:11 -05:00
pahimar
2a7b760398
Restructuring package structure
2013-12-17 15:48:21 -05:00
pahimar
d346895154
Working on some more support for IC2 (good test of the API and how the mod will handle interaction with other mods)
2013-12-17 15:43:31 -05:00
pahimar
beec013625
Playing around with a smarter RecipesVanilla
2013-12-16 23:08:46 -05:00
pahimar
5863efcee6
More work on common ore recipes/emc
2013-12-16 15:50:23 -05:00
pahimar
6e6dfac1f6
Some work on common ore recipes/emc
2013-12-16 14:17:55 -05:00
pahimar
2914f15051
Merge pull request #513 from eslachance/master
...
Added French localisation
2013-12-16 07:46:07 -08:00
pahimar
a6025ddba8
Fix RecipeMappings for IMC related API calls
2013-12-15 23:15:30 -05:00
pahimar
aeaad5d046
Switched to LF vs CRLF line breaks, and code formatting changes
2013-12-15 20:26:42 -05:00
pahimar
1a25990b6f
Comment to remind me where to pick up tomorrow
2013-12-14 22:54:03 -05:00
pahimar
557a05fc9a
Fixed a minor bug in the gradle build, and some prelim work on EmcValues for other mods. LOTS of optimization there still
2013-12-14 22:53:01 -05:00
Evelyne Lachance
3f439c38a3
Added French localisation
2013-12-14 21:48:24 -05:00
AbrarSyed
51b756e17a
Step 3: The Rebirth
2013-12-13 03:45:03 -06:00
AbrarSyed
1c3041ce5d
Step 2: The Reformation
2013-12-13 03:21:58 -06:00
